From cdaab4360a46df277242a976624afe177a0faef3 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Sun, 22 Aug 2010 00:54:30 -0700 Subject: [PATCH] --- yaml --- r: 213902 b: refs/heads/master c: 773bc97397ea2cfc2ff3c075f712aaf376ed7cb0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/tokenring/tms380tr.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 07af97ad58e2..59c29eb972af 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 739a91ef0625e0e4a40b835f4f891313c47915df +refs/heads/master: 773bc97397ea2cfc2ff3c075f712aaf376ed7cb0 diff --git a/trunk/drivers/net/tokenring/tms380tr.c b/trunk/drivers/net/tokenring/tms380tr.c index 435ef7d5470f..08182fde3dcd 100644 --- a/trunk/drivers/net/tokenring/tms380tr.c +++ b/trunk/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); }