From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754655AbbAUPKW (ORCPT ); Wed, 21 Jan 2015 10:10:22 -0500 Received: from mx1.redhat.com ([209.132.183.28]:56740 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753454AbbAUPA3 (ORCPT ); Wed, 21 Jan 2015 10:00:29 -0500 Date: Wed, 21 Jan 2015 17:00:22 +0200 From: "Michael S. Tsirkin" To: linux-kernel@vger.kernel.org Cc: Rusty Russell , virtualization@lists.linux-foundation.org, Gerd Hoffmann Subject: [PATCH pre-squash 06/14] fixup! virtio_pci: modern driver Message-ID: <1421852375-22604-7-git-send-email-mst@redhat.com> References: <1421852375-22604-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1421852375-22604-1-git-send-email-mst@redhat.com> X-Mutt-Fcc: =sent Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org virtio modern: fix up fallback logic This bails out if modern driver succeeds - not what we wanted. Signed-off-by: Michael S. Tsirkin Tested-by: Gerd Hoffmann --- 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