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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 54CE1C432C3 for ; Sat, 16 Nov 2019 15:53:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 239D321887 for ; Sat, 16 Nov 2019 15:53:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573919631; bh=l4vparjXE7s9TQNJo7G5ramjuZ7Osol/anGZJCpStGk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=0SQv5SK+FXqO4lXgeX3pLEeQcHclrcit/Q+HF6Hu2yuQjyvUdFMRhBDlbJXN06G4k qOBV0JSv0+f6gNoI8vD3zhlAyjZ7Vz1sKpN0UQvpYHS6pQWmmTKERujCB4d3OcEy00 4KfZRslePtws1okvk55DCJRI5Ae4/s4rKFwu1wfE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731322AbfKPPxu (ORCPT ); Sat, 16 Nov 2019 10:53:50 -0500 Received: from mail.kernel.org ([198.145.29.99]:35088 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731289AbfKPPxs (ORCPT ); Sat, 16 Nov 2019 10:53:48 -0500 Received: from sasha-vm.mshome.net (unknown [50.234.116.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B5DB821887; Sat, 16 Nov 2019 15:53:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573919628; bh=l4vparjXE7s9TQNJo7G5ramjuZ7Osol/anGZJCpStGk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LANEmuhi0A7h63ROWAeWd1S4H3Oc+KR2ODsaY3JcHVoMF2RJfwyUzK4XFxlw8m6Pp Ya7KAFkLEql0bzYswL8lu9siMAUeuIw6Zp+IRmMUW14SGcSKy7cME59ITHDcf+mx5t UcKYvSb0105rRWG4b93QzMhcDv1MJzbD9ejo7xf0= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sergei Shtylyov , Mark Brown , Sasha Levin , linux-spi@vger.kernel.org Subject: [PATCH AUTOSEL 4.4 08/77] spi: sh-msiof: fix deferred probing Date: Sat, 16 Nov 2019 10:52:30 -0500 Message-Id: <20191116155339.11909-8-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191116155339.11909-1-sashal@kernel.org> References: <20191116155339.11909-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 03b566848da63..b4f136d04a2b1 100644 --- a/drivers/spi/spi-sh-msiof.c +++ b/drivers/spi/spi-sh-msiof.c @@ -1198,8 +1198,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