From patchwork Fri Jan 24 09:27:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 233245 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BFE7FC35242 for ; Fri, 24 Jan 2020 09:47:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9297620718 for ; Fri, 24 Jan 2020 09:47:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579859243; bh=lhaw0L4gWFMtVT2sOAWHcBAMsd7loSoImC8TVfnexZ0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=iVrU4nCafEbcmd6cmaxgMgKIoMCU7I0Y7/0EbER9/UUDUmFUZYVdZ8ME0vImEt4So 1GpYElVDYhHnO/doP30SRV/eU9i2pEjG3hrdGfv3WyTd8TtdPQW1tPC5cvKiESApZr nKxJ+jzB6CidR1D5xLDOAqd3f7uKwpp1iMOtqPyk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732216AbgAXJrO (ORCPT ); Fri, 24 Jan 2020 04:47:14 -0500 Received: from mail.kernel.org ([198.145.29.99]:46990 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730667AbgAXJrO (ORCPT ); Fri, 24 Jan 2020 04:47:14 -0500 Received: from localhost (unknown [145.15.244.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D601A206D5; Fri, 24 Jan 2020 09:47:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579859233; bh=lhaw0L4gWFMtVT2sOAWHcBAMsd7loSoImC8TVfnexZ0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HkmctsDe+nw64R/K1JATTK69upToxhzWb6WjsLQBTFK7R/P9H8Cdqjm6plZi+j9Mv s8a4BJc5nqyMKsij3tRl7MY22BnZ4W74RMnq2iOY+AARLrnDJqKdgPGbTqap4m3Fdc rcPjuJV/HFoDR1awyyRiXLNNA1z0NSO5YXta7FUY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, YueHaibing , Simon Horman , Kieran Bingham , Laurent Pinchart , Sasha Levin Subject: [PATCH 4.14 060/343] drm/shmob: Fix return value check in shmob_drm_probe Date: Fri, 24 Jan 2020 10:27:58 +0100 Message-Id: <20200124092927.746638388@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200124092919.490687572@linuxfoundation.org> References: <20200124092919.490687572@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: YueHaibing [ Upstream commit 06c3bbd3c12737a50c2e981821b5585e1786e73d ] In case of error, the function devm_ioremap_resource() returns ERR_PTR() and never returns NULL. The NULL test in the return value check should be replaced with IS_ERR(). Fixes: 8f1597c8f1a5 ("drm: shmobile: Perform initialization/cleanup at probe/remove time") Signed-off-by: YueHaibing Reviewed-by: Simon Horman Reviewed-by: Kieran Bingham Reviewed-by: Laurent Pinchart Signed-off-by: Laurent Pinchart Signed-off-by: Sasha Levin --- drivers/gpu/drm/shmobile/shmob_drm_drv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/shmobile/shmob_drm_drv.c b/drivers/gpu/drm/shmobile/shmob_drm_drv.c index 592572554eb0e..58d8a98c749b4 100644 --- a/drivers/gpu/drm/shmobile/shmob_drm_drv.c +++ b/drivers/gpu/drm/shmobile/shmob_drm_drv.c @@ -233,8 +233,8 @@ static int shmob_drm_probe(struct platform_device *pdev) res = platform_get_resource(pdev, IORESOURCE_MEM, 0); sdev->mmio = devm_ioremap_resource(&pdev->dev, res); - if (sdev->mmio == NULL) - return -ENOMEM; + if (IS_ERR(sdev->mmio)) + return PTR_ERR(sdev->mmio); ret = shmob_drm_setup_clocks(sdev, pdata->clk_source); if (ret < 0)