From: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx> scsi device runtime PM is using PMSG_SUSPEND. System PM may use other state that may not be compatiable with PMSG_SUSPEND. So we need to runtime resume the device before system suspend. Signed-off-by: Lin Ming <ming.m.lin@xxxxxxxxx> --- Alan, Could you add your Signed-off-by? Free free to change the commit logs. drivers/scsi/scsi_pm.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/drivers/scsi/scsi_pm.c b/drivers/scsi/scsi_pm.c index d329f8b..549ea72 100644 --- a/drivers/scsi/scsi_pm.c +++ b/drivers/scsi/scsi_pm.c @@ -49,8 +49,10 @@ static int scsi_bus_suspend_common(struct device *dev, pm_message_t msg) { int err = 0; - if (scsi_is_sdev_device(dev)) + if (scsi_is_sdev_device(dev)) { + pm_runtime_resume(dev); err = scsi_dev_type_suspend(dev, msg); + } return err; } -- 1.7.2.5 -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html