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 <aaron.lu@xxxxxxxxx>
---
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 1acfe0e..6b843d1 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.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
