aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/tokenring
diff options
context:
space:
mode:
authorDan Carpenter <error27@gmail.com>2010-08-22 03:54:30 -0400
committerDavid S. Miller <davem@davemloft.net>2010-08-22 03:54:30 -0400
commit773bc97397ea2cfc2ff3c075f712aaf376ed7cb0 (patch)
treeecb848e8e2d0978f73e903a49298527859531fa3 /drivers/net/tokenring
parent739a91ef0625e0e4a40b835f4f891313c47915df (diff)
tokenring: remove unneeded NULL checks
"fw_entry" is always non-NULL at this point and anyway release_firmware() handles NULL parameters. Signed-off-by: Dan Carpenter <error27@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/tokenring')
-rw-r--r--drivers/net/tokenring/tms380tr.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/tokenring/tms380tr.c b/drivers/net/tokenring/tms380tr.c
index 435ef7d5470f..08182fde3dcd 100644
--- a/drivers/net/tokenring/tms380tr.c
+++ b/drivers/net/tokenring/tms380tr.c
@@ -1321,14 +1321,12 @@ static int tms380tr_reset_adapter(struct net_device *dev)
1321 1321
1322 /* Clear CPHALT and start BUD */ 1322 /* Clear CPHALT and start BUD */
1323 SIFWRITEW(c, SIFACL); 1323 SIFWRITEW(c, SIFACL);
1324 if (fw_entry) 1324 release_firmware(fw_entry);
1325 release_firmware(fw_entry);
1326 return (1); 1325 return (1);
1327 } 1326 }
1328 } while(count == 0); 1327 } while(count == 0);
1329 1328
1330 if (fw_entry) 1329 release_firmware(fw_entry);
1331 release_firmware(fw_entry);
1332 printk(KERN_INFO "%s: Adapter Download Failed\n", dev->name); 1330 printk(KERN_INFO "%s: Adapter Download Failed\n", dev->name);
1333 return (-1); 1331 return (-1);
1334} 1332}