3.6.11.3 stable review patch. If anyone has any objections, please let me know.
------------------ From: =?UTF-8?q?Sjur=20Br=C3=A6ndeland?= <[email protected]> [ Upstream commit cde42e076c1cdd69a1f955d66ff6596bad3d2105 ] Remove the vdev entry from the list before freeing it, otherwise rproc->vdevs will explode. Cc: [email protected] Signed-off-by: Sjur Brændeland <[email protected]> Acked-by: Ido Yariv <[email protected]> [edit subject, minor commit log edit, cc stable] Signed-off-by: Ohad Ben-Cohen <[email protected]> Signed-off-by: Steven Rostedt <[email protected]> --- drivers/remoteproc/remoteproc_core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c index 70b296f..cf68afb 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c @@ -342,10 +342,12 @@ static int rproc_handle_vdev(struct rproc *rproc, struct fw_rsc_vdev *rsc, /* it is now safe to add the virtio device */ ret = rproc_add_virtio_dev(rvdev, rsc->id); if (ret) - goto free_rvdev; + goto remove_rvdev; return 0; +remove_rvdev: + list_del(&rvdev->node); free_rvdev: kfree(rvdev); return ret; -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
