Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi (e644645a) · Commits · 戴 / test

drivers/scsi/qla2xxx/qla_attr.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -1850,9 +1850,6 @@ qla2x00_port_speed_show(struct device dev, struct device_attribute attr,
		return -EINVAL;
		}

		ql_log(ql_log_info, vha, 0x70d6,
		"port speed:%d\n", ha->link_data_rate);

		return scnprintf(buf, PAGE_SIZE, "%s\n", spd[ha->link_data_rate]);
		}

+8 −2

Original line number	Diff line number	Diff line
		@@ -80,6 +80,10 @@ static int scsi_dev_type_resume(struct device *dev,
		dev_dbg(dev, "scsi resume: %d\n", err);

		if (err == 0) {
		bool was_runtime_suspended;

		was_runtime_suspended = pm_runtime_suspended(dev);

		pm_runtime_disable(dev);
		err = pm_runtime_set_active(dev);
		pm_runtime_enable(dev);
		@@ -93,7 +97,9 @@ static int scsi_dev_type_resume(struct device *dev,
		*/
		if (!err && scsi_is_sdev_device(dev)) {
		struct scsi_device *sdev = to_scsi_device(dev);

		if (was_runtime_suspended)
		blk_post_runtime_resume(sdev->request_queue, 0);
		else
		blk_set_runtime_active(sdev->request_queue);
		}
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -3350,6 +3350,7 @@ static void target_tmr_work(struct work_struct *work)

		cmd->se_tfo->queue_tm_rsp(cmd);

		transport_lun_remove_cmd(cmd);
		transport_cmd_check_stop_to_fabric(cmd);
		return;