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=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 75F24C432C3 for ; Sat, 16 Nov 2019 15:47:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 44FF420729 for ; Sat, 16 Nov 2019 15:47:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573919278; bh=mFIBF4zkhKQuS/73jWsWHvsc1rz6ROijEQbrtvRlYf8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Q141VdXGUJ1nr2KAMlh5nVhTRCvs30eMlPJKxubkZZUj4wIu/IEXiSKyDNJDoIsAU EBVbKqL0tdh5YVbmzNy7vzuUk8Ztb0ypfS+ZNdG0H82oWzqMg82TTaS/+f7r/WNFa/ 7EL6719hAmVjlV1WJrmq0BdIy+XT0/kc3/HYbVEQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729868AbfKPPr4 (ORCPT ); Sat, 16 Nov 2019 10:47:56 -0500 Received: from mail.kernel.org ([198.145.29.99]:54502 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729773AbfKPPrn (ORCPT ); Sat, 16 Nov 2019 10:47:43 -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 18FF0208CC; Sat, 16 Nov 2019 15:47:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573919263; bh=mFIBF4zkhKQuS/73jWsWHvsc1rz6ROijEQbrtvRlYf8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CSZeGT55fci8JoTs/2uMUlw+9SevXPHtztgTkBWyVaScw6cwFVbj8gmCJ9c37/Z3K OF9wQ8y24viH2+v+2TDN3aaXs6+vD5e8ZC9lgnuEHutpp+M/ojLV6CEwMeMlz1yEkp ccx14Ylxe9zxxlAxxHZ3Ia8v5VIGpsWsa6TZU4wA= 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.14 014/150] spi: sh-msiof: fix deferred probing Date: Sat, 16 Nov 2019 10:45:12 -0500 Message-Id: <20191116154729.9573-14-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191116154729.9573-1-sashal@kernel.org> References: <20191116154729.9573-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 db2a529accae8..a7bd3c92356be 100644 --- a/drivers/spi/spi-sh-msiof.c +++ b/drivers/spi/spi-sh-msiof.c @@ -1283,8 +1283,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