[PATCH pre-squash 06/14] fixup! virtio_pci: modern driver
From: "Michael S. Tsirkin" <mst@redhat.com>
Date: 2015-01-21 15:10:22
Also in:
lkml
Subsystem:
the rest, virtio core · Maintainers:
Linus Torvalds, "Michael S. Tsirkin", Jason Wang
virtio modern: fix up fallback logic This bails out if modern driver succeeds - not what we wanted. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Tested-by: Gerd Hoffmann <kraxel@redhat.com> --- drivers/virtio/virtio_pci_common.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/virtio/virtio_pci_common.c b/drivers/virtio/virtio_pci_common.c
index 20c7638..8ae34a3 100644
--- a/drivers/virtio/virtio_pci_common.c
+++ b/drivers/virtio/virtio_pci_common.c@@ -506,10 +506,8 @@ static int virtio_pci_probe(struct pci_dev *pci_dev, goto err_request_regions; rc = virtio_pci_modern_probe(vp_dev); - if (rc != -ENODEV) - return rc; - - rc = virtio_pci_legacy_probe(vp_dev); + if (rc == -ENODEV) + rc = virtio_pci_legacy_probe(vp_dev); if (rc) goto err_probe;
--
MST