---

yaml --- r: 180186 b: refs/heads/master c: c928feb h: refs/heads/master v: v3
git-mirror · Jan 27, 2010 · 1916cca · 1916cca
1 parent 27b9a28
commit 1916cca
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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;
 }