From bb81aaeb0f2ae28c7fbfc1443f7accc2c1c268d6 Mon Sep 17 00:00:00 2001
From: Jesper Juhl <jj@chaosbits.net>
Date: Mon, 9 Apr 2012 22:50:53 +0200
Subject: [PATCH] --- yaml --- r: 300847 b: refs/heads/master c:
 740330254ebc5780aeefec0c5198f88b962f499e h: refs/heads/master i:   300845:
 429d50738370cc18cfcc9e5a088ebbab84c6b2b7   300843:
 5a530da873016952fa05f88c2ac098270a1b1e1e   300839:
 d617201a01703c697c27a97cb9bdcfdfb22200ca   300831:
 939ce486147dd96d1609590d823b0bcd8986bbbc v: v3

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

diff --git a/[refs] b/[refs]
index 05d5f159cd1b..faec49b3585d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c987ce93ad7f96ca637d1f866ff22cfcbfe99d47
+refs/heads/master: 740330254ebc5780aeefec0c5198f88b962f499e
diff --git a/trunk/drivers/net/wireless/atmel.c b/trunk/drivers/net/wireless/atmel.c
index 6c87a823f5a9..d07c0301da6a 100644
--- a/trunk/drivers/net/wireless/atmel.c
+++ b/trunk/drivers/net/wireless/atmel.c
@@ -3989,8 +3989,7 @@ static int reset_atmel_card(struct net_device *dev)
 			atmel_copy_to_card(priv->dev, 0x8000, &fw[0x6000], len - 0x6000);
 		}
 
-		if (fw_entry)
-			release_firmware(fw_entry);
+		release_firmware(fw_entry);
 	}
 
 	err = atmel_wakeup_firmware(priv);