From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 74E9AC4332F for ; Tue, 8 Nov 2022 14:09:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235071AbiKHOJK (ORCPT ); Tue, 8 Nov 2022 09:09:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45454 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235112AbiKHOJI (ORCPT ); Tue, 8 Nov 2022 09:09:08 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 44B24BF7 for ; Tue, 8 Nov 2022 06:09:08 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id D5DB36152D for ; Tue, 8 Nov 2022 14:09:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C3D3DC433D6; Tue, 8 Nov 2022 14:09:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1667916547; bh=Q4wSqSx1JQsdTRhNPlEyhn8kYMQAQQG1jW1ZPVAGzRM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GFtjv6oHUKXjPl4d2E8x0vok65PIkT/j+7vGi5SyZW8+ur0Sy+bPKIVyi1zS65R9L rn+TWZVW7YZPNbjJ/ZWAJhLJuL4QkVpwwFOHuZV4zZ8ZybrYD6gjDBlB28BFy7m8Mu vDys1QQokGncE+5mbkvvkmgvyEYiLh7AVtLxz+J8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Yang Yingliang , Sergey Shtylyov , Damien Le Moal , Sasha Levin Subject: [PATCH 6.0 027/197] ata: palmld: fix return value check in palmld_pata_probe() Date: Tue, 8 Nov 2022 14:37:45 +0100 Message-Id: <20221108133356.026074581@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221108133354.787209461@linuxfoundation.org> References: <20221108133354.787209461@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Yang Yingliang [ Upstream commit 015618c3ec19584c83ff179fa631be8cec906aaf ] If devm_platform_ioremap_resource() fails, it never return NULL pointer, replace the check with IS_ERR(). Fixes: 57bf0f5a162d ("ARM: pxa: use pdev resource for palmld mmio") Signed-off-by: Yang Yingliang Reviewed-by: Sergey Shtylyov Signed-off-by: Damien Le Moal Signed-off-by: Sasha Levin --- drivers/ata/pata_palmld.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/ata/pata_palmld.c b/drivers/ata/pata_palmld.c index 400e65190904..51caa2a427dd 100644 --- a/drivers/ata/pata_palmld.c +++ b/drivers/ata/pata_palmld.c @@ -63,8 +63,8 @@ static int palmld_pata_probe(struct platform_device *pdev) /* remap drive's physical memory address */ mem = devm_platform_ioremap_resource(pdev, 0); - if (!mem) - return -ENOMEM; + if (IS_ERR(mem)) + return PTR_ERR(mem); /* request and activate power and reset GPIOs */ lda->power = devm_gpiod_get(dev, "power", GPIOD_OUT_HIGH); -- 2.35.1