From: "Michael S. Tsirkin" <mst@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: Rusty Russell <rusty@rustcorp.com.au>,
virtualization@lists.linux-foundation.org,
Gerd Hoffmann <kraxel@redhat.com>
Subject: [PATCH pre-squash 06/14] fixup! virtio_pci: modern driver
Date: Wed, 21 Jan 2015 17:00:22 +0200 [thread overview]
Message-ID: <1421852375-22604-7-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1421852375-22604-1-git-send-email-mst@redhat.com>
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
next prev parent reply other threads:[~2015-01-21 15:10 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-21 15:00 [PATCH pre-squash 00/14] virtio 1.0: virtio-pci fixup Michael S. Tsirkin
2015-01-21 15:00 ` [PATCH pre-squash 01/14] virtio_pci: move probe/remove code to common Michael S. Tsirkin
2015-01-21 15:00 ` [PATCH pre-squash 02/14] virtio-pci: define layout for virtio 1.0 Michael S. Tsirkin
2015-01-21 15:00 ` [PATCH pre-squash 03/14] fixup! " Michael S. Tsirkin
2015-01-21 15:00 ` [PATCH pre-squash 04/14] virtio_pci: modern driver Michael S. Tsirkin
2015-01-21 15:00 ` [PATCH pre-squash 05/14] fixup! " Michael S. Tsirkin
2015-01-21 15:00 ` Michael S. Tsirkin [this message]
2015-01-21 15:00 ` [PATCH pre-squash 07/14] virtio_pci: macros for PCI layout offsets Michael S. Tsirkin
2015-01-21 15:00 ` [PATCH pre-squash 08/14] fixup! " Michael S. Tsirkin
2015-01-21 15:00 ` [PATCH pre-squash 09/14] virtio_pci_modern: reduce number of mappings Michael S. Tsirkin
2015-01-21 15:00 ` [PATCH pre-squash 10/14] virtio_pci_modern: support devices with no config Michael S. Tsirkin
2015-01-21 15:00 ` [PATCH pre-squash 11/14] virtio_pci: add an option to disable legacy driver Michael S. Tsirkin
2015-01-21 15:00 ` [PATCH pre-squash 12/14] virtio_pci: add module param to force legacy mode Michael S. Tsirkin
2015-01-21 15:00 ` [PATCH pre-squash 13/14] fixup! " Michael S. Tsirkin
2015-01-21 15:00 ` [PATCH pre-squash 14/14] virtio_pci_modern: drop an unused function Michael S. Tsirkin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1421852375-22604-7-git-send-email-mst@redhat.com \
--to=mst@redhat.com \
--cc=kraxel@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=rusty@rustcorp.com.au \
--cc=virtualization@lists.linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome