Re: [PATCH 1/5] scsi: sr: fix for sr suspend and resume

Alan Stern
2012-07-23T14:50:45Z

On Mon, 23 Jul 2012, Aaron Lu wrote:

> 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_EVENT_AUTO flag.
> 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>
> ---
> drivers/scsi/sr.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
> index 3da0879..5f4d19a 100644
> --- a/drivers/scsi/sr.c
> +++ b/drivers/scsi/sr.c
> @@ -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 (!(msg.event & PM_EVENT_AUTO))

Please use the PMSG_IS_AUTO macro.

Alan Stern