Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp4742969pxj; Wed, 12 May 2021 12:11:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwPr7NJCABu9giscEqLRfScr3bBk+LVgsw3wMkhsPeaYghxUNly/MVUBpReeu27jSMx5Q7N X-Received: by 2002:a17:906:cede:: with SMTP id si30mr37189928ejb.99.1620846673251; Wed, 12 May 2021 12:11:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620846673; cv=none; d=google.com; s=arc-20160816; b=0Ff/YpWLybEuqeayBPufxt+zYkC+ITWux/IEUBkziTIwvo0HM3HuUH9/hwvlU5YGLt qtgOGkvIH8ddZiOVRhlddbWToaejlngoL8qLEMzr9LpC0BYBhHIp+HlNPJY2jKV2moCY hxN1dS9N33DCKnbATglqeB49+V4w/pEcXSPZTVSNkXP0iopmEjsa97/DAgnSeWcYyopw mX8i2AzlLtDdmcKcM32593f9oQ1WuIHnLQRkYrhihZOTjZSMski8A57hBDEKKVqr2I6e PXZgzUR6S2dQAb3QqzYT0tRWYidOyX58JrGIgWI2OcDiMMniftOstQy/zeP1Llft4ycZ d78Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=9ZS34fa2ng/uWnNR0eb+178m5LvCU0syaoPmAgCd144=; b=dKC7WwDLHA/fBcBjnql0o5i2ZEne5issa/+X8nGeQFNIOPQXrvpdaAW5jwaXEu+qFv m1Hi5jFNUDTGV9HKUWxFjd2YJelw6UBfv9/jEx1KEsVcfOd6lqhvP5cpLuyvrerfiuXb T58W/dhU6ePFv056wzNsNCTcmDcFZXMI9RvyXckfyVrf4tuWpbb67I3poLorB+U+Z7PD Qvhwv1BUjeLaWuI/ik+2oEmtoUddKajj0WBjyE/xSHAVzqoHju15kXscXa2Q/0pknjX4 j3+7hpxbR4xT8oZ6ZcfkCDnBVWIM9nmYmj2nZeFXcqh+GjBZwqjX5yyqHD8bp3l+7uFE Mseg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=D88JtsuN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y14si497178edd.373.2021.05.12.12.10.49; Wed, 12 May 2021 12:11:13 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=D88JtsuN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1359316AbhELSwy (ORCPT + 99 others); Wed, 12 May 2021 14:52:54 -0400 Received: from mail.kernel.org ([198.145.29.99]:35798 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243909AbhELQmN (ORCPT ); Wed, 12 May 2021 12:42:13 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id C62BB61C49; Wed, 12 May 2021 16:08:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620835701; bh=gXq2paFHLFWG4gwQI7A79iLmPT74ZRQipM90epusL2U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=D88JtsuNKhfzVZuwqZwfnmru6qQ/7AeF9GKlRBpPRIoO58DSBGubGjT4AgKqzCr9A QUByf8KFtzt5ICjxPiGPgGAt2sECPD6OInvVBggLUVXN5Z61cEZopqAsLcLujA5s0F 1dQq38UMyDmX1XHZhKzEhueCgXkWk7MEvX59hJJM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sergey Shtylyov , "Martin K. Petersen" , Sasha Levin Subject: [PATCH 5.12 415/677] scsi: ufs: ufshcd-pltfrm: Fix deferred probing Date: Wed, 12 May 2021 16:47:41 +0200 Message-Id: <20210512144851.129195520@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210512144837.204217980@linuxfoundation.org> References: <20210512144837.204217980@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Sergey Shtylyov [ Upstream commit 339c9b63cc7ce779ce45c675bf709cb58b807fc3 ] The driver overrides the error codes returned by platform_get_irq() to -ENODEV, so if it returns -EPROBE_DEFER, the driver would fail the probe permanently instead of the deferred probing. Propagate the error code upstream as it should have been done from the start... Link: https://lore.kernel.org/r/420364ca-614a-45e3-4e35-0e0653c7bc53@omprussia.ru Fixes: 2953f850c3b8 ("[SCSI] ufs: use devres functions for ufshcd") Signed-off-by: Sergey Shtylyov Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/ufs/ufshcd-pltfrm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/scsi/ufs/ufshcd-pltfrm.c b/drivers/scsi/ufs/ufshcd-pltfrm.c index 1a69949a4ea1..b56d9b4e5f03 100644 --- a/drivers/scsi/ufs/ufshcd-pltfrm.c +++ b/drivers/scsi/ufs/ufshcd-pltfrm.c @@ -377,7 +377,7 @@ int ufshcd_pltfrm_init(struct platform_device *pdev, irq = platform_get_irq(pdev, 0); if (irq < 0) { - err = -ENODEV; + err = irq; goto out; } -- 2.30.2