shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 18:41:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

ANDROID: scsi: sd: Fix unexpect removal code on Merge commit

Browse Source 
The merge change is incorrect and cause issue at device resume:

[   78.858757][ T2143] sd 0:0:0:0: [sda] Starting disk
[   78.858852][ T2143] sd 0:0:0:0: [sda] Start/Stop Unit failed: Result: hostbyte=DID_OK driverbyte=DRIVER_OK
[   78.858868][ T2143] sd 0:0:0:0: [sda] Sense Key : Unit Attention [current]
[   78.858881][ T2143] sd 0:0:0:0: [sda] Add. Sense: Power on, reset, or bus device reset occurred
[   78.858898][ T2143] sd 0:0:0:0: PM: dpm_run_callback(): scsi_bus_resume+0x0/0x84 returns -5

Bug: 369929235
Fixes: 2b530e8f5d ("Merge 6.1.84 into android14-6.1-lts")
Change-Id: Id96ca2a3c8183f8f9b86cfd9ce173c4acdaaab2c
Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
This commit is contained in:
Yifeng Zhao
2024-09-24 10:42:05 +08:00
committed by Kever Yang
parent 4c2d86d81f
commit c141a306c4
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/scsi/sd.c
View File

@@ -3764,6 +3764,9 @@ static int sd_resume_common(struct device *dev)
if (!sdkp) /* E.g.: runtime resume at the start of sd_probe() */ if (!sdkp) /* E.g.: runtime resume at the start of sd_probe() */
return 0; return 0;
if (!sdkp->device->manage_start_stop)
return 0;
sd_printk(KERN_NOTICE, sdkp, "Starting disk\n"); sd_printk(KERN_NOTICE, sdkp, "Starting disk\n");
ret = sd_start_stop_device(sdkp, 1); ret = sd_start_stop_device(sdkp, 1);