1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c
index a7ce73029f59..1aba255b5879 100644
--- a/drivers/virtio/virtio_pci.c
+++ b/drivers/virtio/virtio_pci.c
@@ -289,9 +289,9 @@ static void vp_free_vectors(struct virtio_device *vdev)
 
                 pci_disable_msix(vp_dev->pci_dev);
                 vp_dev->msix_enabled = 0;
-                vp_dev->msix_vectors = 0;
         }
 
+        vp_dev->msix_vectors = 0;
         vp_dev->msix_used_vectors = 0;
         kfree(vp_dev->msix_names);
         vp_dev->msix_names = NULL;
@@ -309,6 +309,8 @@ static int vp_request_msix_vectors(struct virtio_device *vdev, int nvectors,
         unsigned i, v;
         int err = -ENOMEM;
 
+        vp_dev->msix_vectors = nvectors;
+
         vp_dev->msix_entries = kmalloc(nvectors * sizeof *vp_dev->msix_entries,
                                        GFP_KERNEL);
         if (!vp_dev->msix_entries)
@@ -336,7 +338,6 @@ static int vp_request_msix_vectors(struct virtio_device *vdev, int nvectors,
                 err = -ENOSPC;
         if (err)
                 goto error;
-        vp_dev->msix_vectors = nvectors;
         vp_dev->msix_enabled = 1;
 
         /* Set the vector used for configuration */