From 52364d8796e92ec695eb6167f6ba25ba3572fd4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sjur=20Br=C3=A6ndeland?= <sjur.brandeland@stericsson.com>
Date: Thu, 21 Feb 2013 18:15:32 +0100
Subject: [PATCH] --- yaml --- r: 362332 b: refs/heads/master c:
 cde42e076c1cdd69a1f955d66ff6596bad3d2105 h: refs/heads/master v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/remoteproc/remoteproc_core.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index fa78077a2e68..7055e2b258cc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1cd425b660bd5b4f41b9175b0b7bf3828ce88144
+refs/heads/master: cde42e076c1cdd69a1f955d66ff6596bad3d2105
diff --git a/trunk/drivers/remoteproc/remoteproc_core.c b/trunk/drivers/remoteproc/remoteproc_core.c
index fb0fb342bf96..8edb4aed5d36 100644
--- a/trunk/drivers/remoteproc/remoteproc_core.c
+++ b/trunk/drivers/remoteproc/remoteproc_core.c
@@ -366,10 +366,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;