Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e3fb7d4c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi 

Pull SCSI fixes from James Bottomley:
 "This is two patches both fixing bugs in drivers (virtio-scsi and
  mpt2sas) causing an oops in certain circumstances"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  [SCSI] virtio-scsi: Skip setting affinity on uninitialized vq
  [SCSI] mpt2sas: Don't disable device twice at suspend.
parents 0384dcae 0c8482ac

drivers/scsi/mpt2sas/mpt2sas_scsih.c

+0 −1
Original line number Diff line number Diff line
@@ -8293,7 +8293,6 @@ _scsih_suspend(struct pci_dev *pdev, pm_message_t state) 


	mpt2sas_base_free_resources(ioc);

	pci_save_state(pdev);

	pci_disable_device(pdev);

	pci_set_power_state(pdev, device_state);

	return 0;

}

drivers/scsi/virtio_scsi.c

+5 −1
Original line number Diff line number Diff line
@@ -750,8 +750,12 @@ static void __virtscsi_set_affinity(struct virtio_scsi *vscsi, bool affinity) 


		vscsi->affinity_hint_set = true;

	} else {

		for (i = 0; i < vscsi->num_queues; i++)

		for (i = 0; i < vscsi->num_queues; i++) {

			if (!vscsi->req_vqs[i].vq)

				continue;



			virtqueue_set_affinity(vscsi->req_vqs[i].vq, -1);

		}



		vscsi->affinity_hint_set = false;

	}