From: Martin K. Petersen <martin.petersen@oracle.com>
Date: Thu, 20 Nov 2025 03:59:25 +0000 (-0500)
Subject: Merge branch 6.18/scsi-fixes into 6.19/scsi-staging
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e54f7b4b8159d76d601788ca61267247fac67abf;p=thirdparty%2Flinux.git

Merge branch 6.18/scsi-fixes into 6.19/scsi-staging

Pull in fixes branch to resolve UFS merge conflict.

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
---

e54f7b4b8159d76d601788ca61267247fac67abf
diff --cc drivers/ufs/core/ufshcd.c
index 8d41f17f7796e,d6a060a724618..8f68e305e83c3
--- a/drivers/ufs/core/ufshcd.c
+++ b/drivers/ufs/core/ufshcd.c
@@@ -10939,8 -10882,12 +10940,8 @@@ initialized
  	if (err)
  		goto out_disable;
  
- 	async_schedule(ufshcd_async_scan, hba);
 -	err = ufshcd_add_scsi_host(hba);
 -	if (err)
 -		goto out_disable;
 -
  	ufs_sysfs_add_nodes(hba->dev);
+ 	async_schedule(ufshcd_async_scan, hba);
  
  	device_enable_async_suspend(dev);
  	ufshcd_pm_qos_init(hba);