From 011653652c516edc384a859655e7b5d211a083b8 Mon Sep 17 00:00:00 2001
From: Jesper Juhl <jj@chaosbits.net>
Date: Mon, 9 Apr 2012 22:49:49 +0200
Subject: [PATCH] --- yaml --- r: 306879 b: refs/heads/master c:
 59f34fb3354bb7b5f9d865ccaa2c54d3cf691cb8 h: refs/heads/master i:   306877:
 1653c21a315e321c5358c7540a5bbacb834206de   306875:
 5eed0e16c2185fd84fb820c30d9c7d5a243b9fe4   306871:
 b247b591fc72780d2d5fe71707e14f928fbb19c2   306863:
 a71d318a9b48f13fe154ae06d9bb4d9fc83f0246   306847:
 deac40445986814f74abefd31eceea5bd4048985   306815:
 f460a165a44e487d35fe788bccf40cc89b58730d v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/bluetooth/btmrvl_sdio.c | 9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 058f35a67659..743d90dbe497 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b76bbd6657a2dd7545686ba9ad59625f44192146
+refs/heads/master: 59f34fb3354bb7b5f9d865ccaa2c54d3cf691cb8
diff --git a/trunk/drivers/bluetooth/btmrvl_sdio.c b/trunk/drivers/bluetooth/btmrvl_sdio.c
index 27b74b0d547b..ed62c7f6a553 100644
--- a/trunk/drivers/bluetooth/btmrvl_sdio.c
+++ b/trunk/drivers/bluetooth/btmrvl_sdio.c
@@ -339,9 +339,7 @@ static int btmrvl_sdio_download_helper(struct btmrvl_sdio_card *card)
 
 done:
 	kfree(tmphlprbuf);
-	if (fw_helper)
-		release_firmware(fw_helper);
-
+	release_firmware(fw_helper);
 	return ret;
 }
 
@@ -484,10 +482,7 @@ static int btmrvl_sdio_download_fw_w_helper(struct btmrvl_sdio_card *card)
 
 done:
 	kfree(tmpfwbuf);
-
-	if (fw_firmware)
-		release_firmware(fw_firmware);
-
+	release_firmware(fw_firmware);
 	return ret;
 }