aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Brucker <jean-philippe.brucker@arm.com>2018-07-17 22:14:45 -0400
committerDominique Martinet <dominique.martinet@cea.fr>2018-08-12 20:21:44 -0400
commit92aef4675d5b1b55404e1532379e343bed0e5cf2 (patch)
treec665f7be0788a4915e39724ddeb6f83c88a43001
parentb87d1d26521ef9f2e42bb182184d1427b4e07b26 (diff)
net/9p: fix error path of p9_virtio_probe
Currently when virtio_find_single_vq fails, we go through del_vqs which throws a warning (Trying to free already-free IRQ). Skip del_vqs if vq allocation failed. Link: http://lkml.kernel.org/r/20180524101021.49880-1-jean-philippe.brucker@arm.com Signed-off-by: Jean-Philippe Brucker <jean-philippe.brucker@arm.com> Reviewed-by: Greg Kurz <groug@kaod.org> Cc: Eric Van Hensbergen <ericvh@gmail.com> Cc: Ron Minnich <rminnich@sandia.gov> Cc: Latchesar Ionkov <lucho@ionkov.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Dominique Martinet <dominique.martinet@cea.fr>
-rw-r--r--net/9p/trans_virtio.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c
index 05006cbb3361..eaacce086427 100644
--- a/net/9p/trans_virtio.c
+++ b/net/9p/trans_virtio.c
@@ -563,7 +563,7 @@ static int p9_virtio_probe(struct virtio_device *vdev)
563 chan->vq = virtio_find_single_vq(vdev, req_done, "requests"); 563 chan->vq = virtio_find_single_vq(vdev, req_done, "requests");
564 if (IS_ERR(chan->vq)) { 564 if (IS_ERR(chan->vq)) {
565 err = PTR_ERR(chan->vq); 565 err = PTR_ERR(chan->vq);
566 goto out_free_vq; 566 goto out_free_chan;
567 } 567 }
568 chan->vq->vdev->priv = chan; 568 chan->vq->vdev->priv = chan;
569 spin_lock_init(&chan->lock); 569 spin_lock_init(&chan->lock);
@@ -616,6 +616,7 @@ out_free_tag:
616 kfree(tag); 616 kfree(tag);
617out_free_vq: 617out_free_vq:
618 vdev->config->del_vqs(vdev); 618 vdev->config->del_vqs(vdev);
619out_free_chan:
619 kfree(chan); 620 kfree(chan);
620fail: 621fail:
621 return err; 622 return err;