summaryrefslogtreecommitdiffstats
path: root/drivers/net/tokenring
diff options
context:
space:
mode:
authorDan Carpenter <error27@gmail.com>2010-08-22 09:54:30 +0200
committerDavid S. Miller <davem@davemloft.net>2010-08-22 09:54:30 +0200
commit773bc97397ea2cfc2ff3c075f712aaf376ed7cb0 (patch)
treeecb848e8e2d0978f73e903a49298527859531fa3 /drivers/net/tokenring
parentnet_sched: cls_flow: add key rxhash (diff)
downloadlinux-773bc97397ea2cfc2ff3c075f712aaf376ed7cb0.tar.xz
linux-773bc97397ea2cfc2ff3c075f712aaf376ed7cb0.zip
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)
/* Clear CPHALT and start BUD */
SIFWRITEW(c, SIFACL);
- if (fw_entry)
- release_firmware(fw_entry);
+ release_firmware(fw_entry);
return (1);
}
} while(count == 0);
- if (fw_entry)
- release_firmware(fw_entry);
+ release_firmware(fw_entry);
printk(KERN_INFO "%s: Adapter Download Failed\n", dev->name);
return (-1);
}