]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
scsi: ufs: ufshcd-pltfrm: Fix deferred probing
authorSergey Shtylyov <s.shtylyov@omprussia.ru>
Mon, 29 Mar 2021 20:50:58 +0000 (23:50 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 14 May 2021 08:49:57 +0000 (10:49 +0200)
[ 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 <s.shtylyov@omprussia.ru>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/scsi/ufs/ufshcd-pltfrm.c

index 1a69949a4ea1c16ba2c9ba452eebd28a8f40402e..b56d9b4e5f0332931ab76fa90b83242ab7300a21 100644 (file)
@@ -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;
        }