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 E9124C282C8 for ; Mon, 28 Jan 2019 17:41:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B5CDF2148E for ; Mon, 28 Jan 2019 17:41:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548697300; bh=pacFqHfa/WvwUPlWP3qASifptXFgX4652C3cHSLKFyk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=1sSkdgNQ3THr8nTBTlzLiHO8KXoouVVicQf7uAb7/SDafHuTVFe85vqp9eHosjeSP 5jvBYRxUUGce6icI72PSVa+nI21Gl1inWkBHdBknuCGRG1Qi6wIOZlDVwzKdXPUbvC qzOlA1jbY1LjUOfWdZ3a86gVU3/fWkM6uc2ajxBs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729416AbfA1Rli (ORCPT ); Mon, 28 Jan 2019 12:41:38 -0500 Received: from mail.kernel.org ([198.145.29.99]:37514 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728327AbfA1Puz (ORCPT ); Mon, 28 Jan 2019 10:50:55 -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 5940120880; Mon, 28 Jan 2019 15:50:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548690654; bh=pacFqHfa/WvwUPlWP3qASifptXFgX4652C3cHSLKFyk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WmJIcaYHSdHEemKQR/DCHBYdkuIODqXVmMvt6JbZM6dzzBQM60DK9L+gjeSmIOR2l RFfUUQhZany2cSfHjZhLsMUva13pNacT/AaSl9ejH/UJeZ2RECoUDkB1T0peRVsw0w gQZapvda6qHY7l1dVZqvyB4vVjOzlHn7nkho9z34= 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.20 155/304] sata_rcar: fix deferred probing Date: Mon, 28 Jan 2019 10:41:12 -0500 Message-Id: <20190128154341.47195-155-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190128154341.47195-1-sashal@kernel.org> References: <20190128154341.47195-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 4b1ff5bc256a..59b2317acea9 100644 --- a/drivers/ata/sata_rcar.c +++ b/drivers/ata/sata_rcar.c @@ -891,7 +891,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(dev, sizeof(struct sata_rcar_priv), GFP_KERNEL); -- 2.19.1