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,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 D66F1C282C8 for ; Mon, 28 Jan 2019 16:22:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 993C92147A for ; Mon, 28 Jan 2019 16:22:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548692530; bh=MUxOIE1tqYoWUBy60HqP8QzdqOo38roiU8cu1c7afLU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=BI5F07plwqf+Bk7fVnKauosvEJTvM2f7q7vdn8uQtxIjnVPhxeyH6ABwa/AO1+oZk aUs5PQk1PXuYcbLIF1+CxoBTBps4ESC4t16ZlNVMtmneOMGUKcEryccbRe3TDR0NM3 75NBA2viNXO46m/5NTPJ8LllUYV50kEMC1K5pTng= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728984AbfA1QWJ (ORCPT ); Mon, 28 Jan 2019 11:22:09 -0500 Received: from mail.kernel.org ([198.145.29.99]:58046 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389110AbfA1QWG (ORCPT ); Mon, 28 Jan 2019 11:22:06 -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 D38D620663; Mon, 28 Jan 2019 16:22:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548692526; bh=MUxOIE1tqYoWUBy60HqP8QzdqOo38roiU8cu1c7afLU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=B+Jp9FIVBTmSHJOJ3gAyVtMBKa0uww1qp4bxW+/y+dfs7Jt80tUX9uO+AsuaeBK5g yg4nZ+JDkkcJP5GcB8svTOX7RJhp+osx3pC7Kqw8V/KjRxw4HDQm6QxGLGqD6oJdLo r7wdKcjbMq0JqRKW4VTeoI41jFSQ18mZuNgnxyE4= 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.9 050/107] sata_rcar: fix deferred probing Date: Mon, 28 Jan 2019 11:18:50 -0500 Message-Id: <20190128161947.57405-50-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190128161947.57405-1-sashal@kernel.org> References: <20190128161947.57405-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 e83a3d3421b9..07e146b772ea 100644 --- a/drivers/ata/sata_rcar.c +++ b/drivers/ata/sata_rcar.c @@ -872,7 +872,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