lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Linus Torvalds
2014-05-04 14:31:51 -07:00
parent 0384dcae2b 0c8482ac92
commit e3fb7d4cc0
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/scsi/mpt2sas/mpt2sas_scsih.c
View File

@@ -8293,7 +8293,6 @@ _scsih_suspend(struct pci_dev *pdev, pm_message_t state)
mpt2sas_base_free_resources(ioc); mpt2sas_base_free_resources(ioc);
pci_save_state(pdev); pci_save_state(pdev);
pci_disable_device(pdev);
pci_set_power_state(pdev, device_state); pci_set_power_state(pdev, device_state);
return 0; return 0;
} }

6
drivers/scsi/virtio_scsi.c
View File

@@ -750,8 +750,12 @@ static void __virtscsi_set_affinity(struct virtio_scsi *vscsi, bool affinity)
vscsi->affinity_hint_set = true; vscsi->affinity_hint_set = true;
} else { } 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); virtqueue_set_affinity(vscsi->req_vqs[i].vq, -1);
}
vscsi->affinity_hint_set = false; vscsi->affinity_hint_set = false;
} }