Skip to content

Commit

Permalink
remoteproc: fix error path of ->find_vqs
Browse files Browse the repository at this point in the history
Eliminate an erroneous invocation of rproc_shutdown inside
the error path of rproc_virtio_find_vqs.

Reported-by: Ido Yariv <ido@wizery.com>
Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com>
  • Loading branch information
Ohad Ben-Cohen committed Nov 29, 2012
1 parent 6f0c058 commit dab55bb
Showing 1 changed file with 12 additions and 6 deletions.
18 changes: 12 additions & 6 deletions drivers/remoteproc/remoteproc_virtio.c
Original file line number Diff line number Diff line change
Expand Up @@ -120,15 +120,11 @@ static struct virtqueue *rp_find_vq(struct virtio_device *vdev,
return vq;
}

static void rproc_virtio_del_vqs(struct virtio_device *vdev)
static void __rproc_virtio_del_vqs(struct virtio_device *vdev)
{
struct virtqueue *vq, *n;
struct rproc *rproc = vdev_to_rproc(vdev);
struct rproc_vring *rvring;

/* power down the remote processor before deleting vqs */
rproc_shutdown(rproc);

list_for_each_entry_safe(vq, n, &vdev->vqs, list) {
rvring = vq->priv;
rvring->vq = NULL;
Expand All @@ -137,6 +133,16 @@ static void rproc_virtio_del_vqs(struct virtio_device *vdev)
}
}

static void rproc_virtio_del_vqs(struct virtio_device *vdev)
{
struct rproc *rproc = vdev_to_rproc(vdev);

/* power down the remote processor before deleting vqs */
rproc_shutdown(rproc);

__rproc_virtio_del_vqs(vdev);
}

static int rproc_virtio_find_vqs(struct virtio_device *vdev, unsigned nvqs,
struct virtqueue *vqs[],
vq_callback_t *callbacks[],
Expand All @@ -163,7 +169,7 @@ static int rproc_virtio_find_vqs(struct virtio_device *vdev, unsigned nvqs,
return 0;

error:
rproc_virtio_del_vqs(vdev);
__rproc_virtio_del_vqs(vdev);
return ret;
}

Expand Down

0 comments on commit dab55bb

Please sign in to comment.