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,HEADER_FROM_DIFFERENT_DOMAINS,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 88902C43381 for ; Mon, 18 Feb 2019 14:09:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 572F72173C for ; Mon, 18 Feb 2019 14:09:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550498989; bh=u+fhuPa24U23KArZ6uAa9/XYZX1cF/lCmzihsp36Nuc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=hSQ5QYocFTZhSy2CLun7xyOqRBFGZt+surNcRkB+osLon04zWQxABkExV3hkLwUec /jenprgfWS3vIhY2I2kEuAd7qUBoRi+hxkP5lFSjVxt9ec+7CTEbWzt2l7MzeQvgnu zXBo4cu9GAC9bypm230WZGAQjaZIIhRHDUCnlj74= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391292AbfBROJs (ORCPT ); Mon, 18 Feb 2019 09:09:48 -0500 Received: from mail.kernel.org ([198.145.29.99]:53368 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390752AbfBROJo (ORCPT ); Mon, 18 Feb 2019 09:09:44 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C8579217D9; Mon, 18 Feb 2019 14:09:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550498984; bh=u+fhuPa24U23KArZ6uAa9/XYZX1cF/lCmzihsp36Nuc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pk+IXl3mxDv2M4BGD+gnlJnjm0CQlXYeTPqfwcnrhlVbMUhxVZQog6l4NmPTT8dol cJ1lHOaqBYVu8yG7hQ1sFuG6yaYYy0b0gvNGGHE3VKmsqUBrAaZ9+lRp87CKcEWNju RHPzsJmhQrd+g4UChAoMGh6tG0u9DwqddC7PAQlw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Simon Horman , Geert Uytterhoeven , Sergei Shtylyov , Jens Axboe , Sasha Levin Subject: [PATCH 3.18 022/108] sata_rcar: fix deferred probing Date: Mon, 18 Feb 2019 14:43:18 +0100 Message-Id: <20190218133520.545510319@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190218133519.525507231@linuxfoundation.org> References: <20190218133519.525507231@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ [ 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 ea1fbc1d4c5f..e7e259a6c732 100644 --- a/drivers/ata/sata_rcar.c +++ b/drivers/ata/sata_rcar.c @@ -879,7 +879,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