From: Liu Yuan <[email protected]> In the function vp_request_msix_vectors(), when pci_enable_msix() returns 0, there will be redundant double checks for 'err'. This patch fixes it to avoid the unnecessary check.
Signed-off-by: Liu Yuan <[email protected]> --- drivers/virtio/virtio_pci.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c index 4fb5b2b..2c05376 100644 --- a/drivers/virtio/virtio_pci.c +++ b/drivers/virtio/virtio_pci.c @@ -298,10 +298,11 @@ static int vp_request_msix_vectors(struct virtio_device *vdev, int nvectors, /* pci_enable_msix returns positive if we can't get this many. */ err = pci_enable_msix(vp_dev->pci_dev, vp_dev->msix_entries, nvectors); - if (err > 0) - err = -ENOSPC; - if (err) + if (err) { + if (err > 0) + err = -ENOSPC; goto error; + } vp_dev->msix_vectors = nvectors; vp_dev->msix_enabled = 1; -- 1.7.1 _______________________________________________ Virtualization mailing list [email protected] https://lists.linux-foundation.org/mailman/listinfo/virtualization
