Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull SCSI fixes from James Bottomley:
"Three minor fixes, two in drivers, one to fix a hang after reset with
iSCSI, and one to avoid a spurious log message; and the final core one
to correct a suspend/resume miscount with quiesced devices"
* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
scsi: target: Put lun_ref at end of tmr processing
scsi: pm: Balance pm_only counter of request queue during system resume
scsi: qla2xxx: Do not log message when reading port speed via sysfs
+9
-5
-3
drivers/scsi/qla2xxx/qla_attr.c
-3
drivers/scsi/qla2xxx/qla_attr.c
+8
-2
drivers/scsi/scsi_pm.c
+8
-2
drivers/scsi/scsi_pm.c
···
80
80
dev_dbg(dev, "scsi resume: %d\n", err);
81
81
82
82
if (err == 0) {
83
+
bool was_runtime_suspended;
84
+
85
+
was_runtime_suspended = pm_runtime_suspended(dev);
86
+
83
87
pm_runtime_disable(dev);
84
88
err = pm_runtime_set_active(dev);
85
89
pm_runtime_enable(dev);
···
97
93
*/
98
94
if (!err && scsi_is_sdev_device(dev)) {
99
95
struct scsi_device *sdev = to_scsi_device(dev);
100
-
101
-
blk_set_runtime_active(sdev->request_queue);
96
+
if (was_runtime_suspended)
97
+
blk_post_runtime_resume(sdev->request_queue, 0);
98
+
else
99
+
blk_set_runtime_active(sdev->request_queue);
102
100
}
103
101
}
104
102