From: Jesper Juhl <jj@chaosbits.net>
Date: Mon, 9 Apr 2012 20:50:15 +0000 (+0200)
Subject: tg3: remove redundant NULL test before release_firmware() call
X-Git-Tag: v2.6.39-400.9.0~338^2~151
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b1813c505f59b0078ef8f550f483c837858b27a9;p=users%2Fjedix%2Flinux-maple.git

tg3: remove redundant NULL test before release_firmware() call

There is no need to test for a NULL pointer before calling
release_firmware - the function does that on its own.

(cherry picked from commit e3c5530b96b9c5994cfb2544a037161790c4f7c3)
Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Joe Jin <joe.jin@oracle.com>
---

diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index cb0db80b1c9f..786eb244cf6b 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -15852,8 +15852,7 @@ static void __devexit tg3_remove_one(struct pci_dev *pdev)
 	if (dev) {
 		struct tg3 *tp = netdev_priv(dev);
 
-		if (tp->fw)
-			release_firmware(tp->fw);
+		release_firmware(tp->fw);
 
 		tg3_reset_task_cancel(tp);