From c141a306c4ba0aff62ac0c41450215f18d60fab1 Mon Sep 17 00:00:00 2001 From: Yifeng Zhao Date: Tue, 24 Sep 2024 10:42:05 +0800 Subject: [PATCH] ANDROID: scsi: sd: Fix unexpect removal code on Merge commit 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: 2b530e8f5da4 ("Merge 6.1.84 into android14-6.1-lts") Change-Id: Id96ca2a3c8183f8f9b86cfd9ce173c4acdaaab2c Signed-off-by: Yifeng Zhao Signed-off-by: Kever Yang --- drivers/scsi/sd.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 73caef6d0c95..3f437627415a 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -3764,6 +3764,9 @@ static int sd_resume_common(struct device *dev) if (!sdkp) /* E.g.: runtime resume at the start of sd_probe() */ return 0; + if (!sdkp->device->manage_start_stop) + return 0; + sd_printk(KERN_NOTICE, sdkp, "Starting disk\n"); ret = sd_start_stop_device(sdkp, 1);