From 1f0304abbe9a20f4e3832422074c66ce065e856a Mon Sep 17 00:00:00 2001
From: Jesper Juhl <jj@chaosbits.net>
Date: Mon, 9 Apr 2012 22:51:25 +0200
Subject: [PATCH] --- yaml --- r: 305124 b: refs/heads/master c:
 3cc6e78777ae6f577b67e26c76577ef357ac9009 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 7afeab8f7027..43e9e147da25 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cf92549f1c95e0b1fd980828c35416dc2e548d2b
+refs/heads/master: 3cc6e78777ae6f577b67e26c76577ef357ac9009
diff --git a/trunk/drivers/remoteproc/remoteproc_core.c b/trunk/drivers/remoteproc/remoteproc_core.c
index ee15c68fb519..3d2884b0a4fc 100644
--- a/trunk/drivers/remoteproc/remoteproc_core.c
+++ b/trunk/drivers/remoteproc/remoteproc_core.c
@@ -1105,8 +1105,7 @@ static void rproc_fw_config_virtio(const struct firmware *fw, void *context)
 		goto out;
 
 out:
-	if (fw)
-		release_firmware(fw);
+	release_firmware(fw);
 	/* allow rproc_unregister() contexts, if any, to proceed */
 	complete_all(&rproc->firmware_loading_complete);
 }