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 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,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 20394C432C3 for ; Wed, 27 Nov 2019 20:56:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EB9292154A for ; Wed, 27 Nov 2019 20:56:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574888211; bh=BNG1lRWcivrcVSSJ5JADbls1JW9lsGLGjJzIes5u76M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=dFt8J5O1Fq4w9f1/a0T81lNhlYDRgfjMaUkRzrkVmIH0Yzv9saixnsc3zg3aZI9vg W8KMKrH9U8ju/qhWXt5yDTRKauaTdYzy+DzrywBQrXsW9DvOe90GBkVHcgUKrxEuJ7 zCpgq+o8+MJmwLtlB7F6v1ntmD2DHBdRWTQNmvMw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728292AbfK0U4t (ORCPT ); Wed, 27 Nov 2019 15:56:49 -0500 Received: from mail.kernel.org ([198.145.29.99]:47644 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730524AbfK0U4s (ORCPT ); Wed, 27 Nov 2019 15:56:48 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 99C7520862; Wed, 27 Nov 2019 20:56:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574888207; bh=BNG1lRWcivrcVSSJ5JADbls1JW9lsGLGjJzIes5u76M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eCKAEGJAxeO+yB+6PA/Ywfn0li+QPN6rBogWIQDsYrJ3qedELMX3eyUCtMTGGgWe4 YN9c0nCHkHq75Cpr2fZvznl4H3v+sAcn79FKWZbg5pjBsfpH2c/NIwmx5Ug+peARRF ELv3UXUBjLKLNBJovxoW9kKIJt/NBuW74tSQjhfw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sergei Shtylyov , Mark Brown , Sasha Levin Subject: [PATCH 4.19 044/306] spi: sh-msiof: fix deferred probing Date: Wed, 27 Nov 2019 21:28:14 +0100 Message-Id: <20191127203118.046197316@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191127203114.766709977@linuxfoundation.org> References: <20191127203114.766709977@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Sergei Shtylyov [ Upstream commit f34c6e6257aa477cdfe7e9bbbecd3c5648ecda69 ] Since commit 9ec36cafe43b ("of/irq: do irq resolution in platform_get_irq") platform_get_irq() can return -EPROBE_DEFER. However, the driver overrides an error returned by that function with -ENOENT which breaks the deferred probing. Propagate upstream an error code returned by platform_get_irq() and remove the bogus "platform" from the error message, while at it... Fixes: 9ec36cafe43b ("of/irq: do irq resolution in platform_get_irq") Signed-off-by: Sergei Shtylyov Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- drivers/spi/spi-sh-msiof.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c index 101cd6aae2ea5..30ea0a2068e09 100644 --- a/drivers/spi/spi-sh-msiof.c +++ b/drivers/spi/spi-sh-msiof.c @@ -1343,8 +1343,8 @@ static int sh_msiof_spi_probe(struct platform_device *pdev) i = platform_get_irq(pdev, 0); if (i < 0) { - dev_err(&pdev->dev, "cannot get platform IRQ\n"); - ret = -ENOENT; + dev_err(&pdev->dev, "cannot get IRQ\n"); + ret = i; goto err1; } -- 2.20.1