[PATCH v6 6/7] scsi: sr: use may_power_off
From: Aaron Lu <hidden>
Date: 2012-09-04 14:25:56
Also in:
linux-ide, linux-scsi
Subsystem:
scsi subsystem, the rest · Maintainers:
"James E.J. Bottomley", "Martin K. Petersen", Linus Torvalds
From: Aaron Lu <redacted> With the introduction of may_power_off, when deciding if we can block events checking, may_power_off should be used. Signed-off-by: Aaron Lu <redacted> --- drivers/scsi/sr.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
index a5bb687..291f38c 100644
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c@@ -204,7 +204,7 @@ static int sr_suspend(struct device *dev, pm_message_t msg) if (!suspend) return -EBUSY; - if (cd->device->can_power_off) { + if (cd->device->may_power_off) { cd->disk_events_blocked = 1; disk_block_events(cd->disk); }
@@ -794,6 +794,9 @@ static int sr_probe(struct device *dev) sdev_printk(KERN_DEBUG, sdev, "Attached scsi CD-ROM %s\n", cd->cdi.name); + if (cd->device->can_power_off) + cd->device->may_power_off = 1; + /* enable runtime pm */ scsi_autopm_put_device(cd->device);
--
1.7.11.3