summaryrefslogtreecommitdiffstats
path: root/drivers/virtio/virtio_pci_legacy.c
diff options
context:
space:
mode:
authorMichael S. Tsirkin2017-04-04 20:09:20 +0200
committerMichael S. Tsirkin2017-04-10 23:28:41 +0200
commit2008c1544c73d5190f81ef1790fa5bd2fade5bd0 (patch)
tree2569fe5b0deec35bdad7dddd93e794a204fbac5e /drivers/virtio/virtio_pci_legacy.c
parentRevert "virtio_pci: simplify MSI-X setup" (diff)
downloadkernel-qcow2-linux-2008c1544c73d5190f81ef1790fa5bd2fade5bd0.tar.gz
kernel-qcow2-linux-2008c1544c73d5190f81ef1790fa5bd2fade5bd0.tar.xz
kernel-qcow2-linux-2008c1544c73d5190f81ef1790fa5bd2fade5bd0.zip
Revert "virtio_pci: don't duplicate the msix_enable flag in struct pci_dev"
This reverts commit 53a020c661741f3b87ad3ac6fa545088aaebac9b. The cleanup seems to be one of the changes that broke hybernation for some users. We are still not sure why but revert helps. Tested-by: Mike Galbraith <efault@gmx.de> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'drivers/virtio/virtio_pci_legacy.c')
-rw-r--r--drivers/virtio/virtio_pci_legacy.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/virtio/virtio_pci_legacy.c b/drivers/virtio/virtio_pci_legacy.c
index f7362c5fe18a..5dd01f09608b 100644
--- a/drivers/virtio/virtio_pci_legacy.c
+++ b/drivers/virtio/virtio_pci_legacy.c
@@ -165,7 +165,7 @@ static void del_vq(struct virtqueue *vq)
iowrite16(vq->index, vp_dev->ioaddr + VIRTIO_PCI_QUEUE_SEL);
- if (vp_dev->pci_dev->msix_enabled) {
+ if (vp_dev->msix_enabled) {
iowrite16(VIRTIO_MSI_NO_VECTOR,
vp_dev->ioaddr + VIRTIO_MSI_QUEUE_VECTOR);
/* Flush the write out to device */