From 1916cca8b1e93c463e2bc3d7f7f56ab291626814 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <bhutchings@solarflare.com>
Date: Tue, 26 Jan 2010 18:27:09 +0000
Subject: [PATCH] --- yaml --- r: 180186 b: refs/heads/master c:
 c928febf4bc703ea542340e5a208e0445d998839 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/net/starfire.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 701815e21518..e3dd3384d4cd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c92b544bd5d8e7ed7d81c77bbecab6df2a95aa53
+refs/heads/master: c928febf4bc703ea542340e5a208e0445d998839
diff --git a/trunk/drivers/net/starfire.c b/trunk/drivers/net/starfire.c
index 95db60adde41..f9521136a869 100644
--- a/trunk/drivers/net/starfire.c
+++ b/trunk/drivers/net/starfire.c
@@ -1063,7 +1063,7 @@ static int netdev_open(struct net_device *dev)
 	if (retval) {
 		printk(KERN_ERR "starfire: Failed to load firmware \"%s\"\n",
 		       FIRMWARE_RX);
-		return retval;
+		goto out_init;
 	}
 	if (fw_rx->size % 4) {
 		printk(KERN_ERR "starfire: bogus length %zu in \"%s\"\n",
@@ -1108,6 +1108,9 @@ static int netdev_open(struct net_device *dev)
 	release_firmware(fw_tx);
 out_rx:
 	release_firmware(fw_rx);
+out_init:
+	if (retval)
+		netdev_close(dev);
 	return retval;
 }