diff options
| author | Aaron Lu <aaron.lu@amd.com> | 2012-05-15 14:43:00 +0800 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2012-05-22 11:09:50 +0100 |
| commit | d20ec597cba1e8ea407c9a7c668a9e04fc057c83 (patch) | |
| tree | 8b4807a70dbeaca14a882ef96bc0410bcf1f464f /drivers/scsi/scsi_pm.c | |
| parent | 6192bd7cdc37e2df9391403235b72668a5bf27da (diff) | |
| download | linux-stable-d20ec597cba1e8ea407c9a7c668a9e04fc057c83.tar.gz linux-stable-d20ec597cba1e8ea407c9a7c668a9e04fc057c83.tar.bz2 linux-stable-d20ec597cba1e8ea407c9a7c668a9e04fc057c83.zip | |
[SCSI] scsi_pm: resume device if suspend failed
For scsi devices which use scsi bus runtime callback, runtime suspend
will call scsi_dev_type_suspend, and if the drv->suspend failed, the
device will still be in active state. But since scsi_device_quiesce is
called, the device will not be able to respond any more commands.
So add a check here to see if err occured, if so, bring the device back
to normal state with scsi_device_resume.
Signed-off-by: Aaron Lu <aaron.lu@amd.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/scsi_pm.c')
| -rw-r--r-- | drivers/scsi/scsi_pm.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/scsi/scsi_pm.c b/drivers/scsi/scsi_pm.c index f661a41fa4c6..d4201ded3b22 100644 --- a/drivers/scsi/scsi_pm.c +++ b/drivers/scsi/scsi_pm.c @@ -24,8 +24,11 @@ static int scsi_dev_type_suspend(struct device *dev, pm_message_t msg) err = scsi_device_quiesce(to_scsi_device(dev)); if (err == 0) { drv = dev->driver; - if (drv && drv->suspend) + if (drv && drv->suspend) { err = drv->suspend(dev, msg); + if (err) + scsi_device_resume(to_scsi_device(dev)); + } } dev_dbg(dev, "scsi suspend: %d\n", err); return err; |