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.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 CC507C282CD for ; Mon, 28 Jan 2019 17:00:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 98EB52175B for ; Mon, 28 Jan 2019 17:00:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548694824; bh=fagDAzuxp4wgGsEH2MHRjPpd4d8M+KTBwQPYOQ+Ohyc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=cpzS7D0GFhcAGTwQ1tHNenUqDtcitxJl2ate3hd7RvGrvyLMWZ9uuT0b0cG5tvdjW 0R/qFo1einNRVm/eSyWYk6gjIg+q7KFzp6qOiMsCXZBbBGJEn1IS3I5MYnZhZDKG9B YpdKCLQf2VvXu3cBjQf79oIrfgonf5zXawKXEWEQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387996AbfA1RAW (ORCPT ); Mon, 28 Jan 2019 12:00:22 -0500 Received: from mail.kernel.org ([198.145.29.99]:46226 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387830AbfA1QPm (ORCPT ); Mon, 28 Jan 2019 11:15:42 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (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 5783420879; Mon, 28 Jan 2019 16:15:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548692141; bh=fagDAzuxp4wgGsEH2MHRjPpd4d8M+KTBwQPYOQ+Ohyc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HawhNBD5vwXirdIziicv0XQKoVxyancbCMyBRKKBV/WotN1dcgMdPE/2Et1AQEoQV GxU061B6w71/nEBDPlexMDqKzjE8m0mQfB/JbkAp2P2kU3Z9c6TwVrRhqru36Fumqi wEIk/rmQJM8bk3OJH5ifSTX0RVZ6P87t7m7NFQ7o= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sergei Shtylyov , Jens Axboe , Sasha Levin , linux-ide@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 086/170] sata_rcar: fix deferred probing Date: Mon, 28 Jan 2019 11:10:36 -0500 Message-Id: <20190128161200.55107-86-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190128161200.55107-1-sashal@kernel.org> References: <20190128161200.55107-1-sashal@kernel.org> MIME-Version: 1.0 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 9f83cfdb1ace3ef268ecc6fda50058d2ec37d603 ] The driver overrides the error codes returned by platform_get_irq() to -EINVAL, so if it returns -EPROBE_DEFER, the driver would fail the probe permanently instead of the deferred probing. Switch to propagating the error code upstream, still checking/overriding IRQ0 as libata regards it as "no IRQ" (thus polling) anyway... Fixes: 9ec36cafe43b ("of/irq: do irq resolution in platform_get_irq") Reviewed-by: Simon Horman Reviewed-by: Geert Uytterhoeven Signed-off-by: Sergei Shtylyov Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- drivers/ata/sata_rcar.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/ata/sata_rcar.c b/drivers/ata/sata_rcar.c index 537d11869069..3e82a4ac239e 100644 --- a/drivers/ata/sata_rcar.c +++ b/drivers/ata/sata_rcar.c @@ -880,7 +880,9 @@ static int sata_rcar_probe(struct platform_device *pdev) int ret = 0; irq = platform_get_irq(pdev, 0); - if (irq <= 0) + if (irq < 0) + return irq; + if (!irq) return -EINVAL; priv = devm_kzalloc(&pdev->dev, sizeof(struct sata_rcar_priv), -- 2.19.1