From 7abbcd752b8d49f194f9ab1c679c7b0bacceb58b Mon Sep 17 00:00:00 2001
From: Jesper Juhl <jj@chaosbits.net>
Date: Mon, 9 Apr 2012 22:50:10 +0200
Subject: [PATCH] --- yaml --- r: 305117 b: refs/heads/master c:
 b2cbf2e31bd26abaddcb1ce4cefb09e025247d52 h: refs/heads/master i:   305115:
 36f10906d92d1c8ba2cf04b919520a2f99906906 v: v3

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

diff --git a/[refs] b/[refs]
index ea40c3c42df5..19a57f4cec5c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c69a6ca1a4e398e7e85cab792ddbd874d9335233
+refs/heads/master: b2cbf2e31bd26abaddcb1ce4cefb09e025247d52
diff --git a/trunk/drivers/net/ethernet/3com/typhoon.c b/trunk/drivers/net/ethernet/3com/typhoon.c
index 1234a14b2b73..b15366635147 100644
--- a/trunk/drivers/net/ethernet/3com/typhoon.c
+++ b/trunk/drivers/net/ethernet/3com/typhoon.c
@@ -2549,8 +2549,7 @@ typhoon_init(void)
 static void __exit
 typhoon_cleanup(void)
 {
-	if (typhoon_fw)
-		release_firmware(typhoon_fw);
+	release_firmware(typhoon_fw);
 	pci_unregister_driver(&typhoon_driver);
 }