@@ -178,8 +178,8 @@ static int sr_suspend(struct device *dev, pm_message_t msg)
struct scsi_sense_hdr sshdr;
struct scsi_cd *cd = dev_get_drvdata(dev);
- /* no action for system suspend */
- if (msg.event == PM_EVENT_SUSPEND)
+ /* no action for system pm operations */
+ if (!PMSG_IS_AUTO(msg))
return 0;
/* do another TUR to see if the ODD is still ready to be powered off */
@@ -217,9 +217,9 @@ static int sr_resume(struct device *dev)
cd->device->wakeup_by_user = 0;
if (!(cd->cdi.mask & CDC_CLOSE_TRAY))
sr_tray_move(&cd->cdi, 1);
- }
- atomic_set(&cd->suspend_count, 1);
+ atomic_set(&cd->suspend_count, 1);
+ }
return 0;
}
In sr_suspend, we do not need to do anything if it is not a runtime pm request, so just return by checking the PM_IS_AUTO macro. And in sr_resume, only reset the suspend_count back to 1 if the ODD is waken up by the user, or the usage count of the scsi device will not balance. Signed-off-by: Aaron Lu <aaron.lu@amd.com> --- V2: Use PMSG_IS_AUTO as suggested by Alan Stern. drivers/scsi/sr.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)