From 6671d6c45ecbf7c4c993ae6c4d5e62dba8e9cdf8 Mon Sep 17 00:00:00 2001
From: Jesper Juhl <jj@chaosbits.net>
Date: Mon, 9 Apr 2012 22:51:48 +0200
Subject: [PATCH] --- yaml --- r: 304359 b: refs/heads/master c:
 c5714b5acfb0ea7816340ba37bb8631c7061448e h: refs/heads/master i:   304357:
 7166b777b656a4ff17158c4113aa7fba4b47518b   304355:
 a91b19e0f168f754162cbf11ce09fac87eacbd0e   304351:
 a85218383ec9bcc8ab92c4878db68a1994c0cb9e v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/staging/media/as102/as102_fw.c | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 7bc076e08adc..2c8f5634ffcc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a6c8ef9526f149ce884b36841cc2e17ca890f1a4
+refs/heads/master: c5714b5acfb0ea7816340ba37bb8631c7061448e
diff --git a/trunk/drivers/staging/media/as102/as102_fw.c b/trunk/drivers/staging/media/as102/as102_fw.c
index 43ebc43e6b9a..9db275e2cede 100644
--- a/trunk/drivers/staging/media/as102/as102_fw.c
+++ b/trunk/drivers/staging/media/as102/as102_fw.c
@@ -230,11 +230,8 @@ int as102_fw_upload(struct as10x_bus_adapter_t *bus_adap)
 	pr_info("%s: firmware: %s loaded with success\n",
 		DRIVER_NAME, fw2);
 error:
-	/* free data buffer */
 	kfree(cmd_buf);
-	/* release firmware if needed */
-	if (firmware != NULL)
-		release_firmware(firmware);
+	release_firmware(firmware);
 
 	LEAVE();
 	return errno;