| From 6d301ecf6379552c53d76900311b8ea261b73985 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 29 Mar 2021 23:50:58 +0300 |
| Subject: scsi: ufs: ufshcd-pltfrm: Fix deferred probing |
| |
| From: Sergey Shtylyov <s.shtylyov@omprussia.ru> |
| |
| [ 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 | 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 |
| |
