---

yaml --- r: 237331 b: refs/heads/master c: 84f0e17 h: refs/heads/master i: 237329: a6762a7 237327: e5bcbe2 v: v3
git-mirror · Feb 8, 2011 · a3b1f21 · a3b1f21
1 parent ced80f7
commit a3b1f21
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d37f50e19094862a5d60d79637d6f4dbdc42f4f1
+refs/heads/master: 84f0e17f78471857104a20dfc57711409f68d7bf
diff --git a/trunk/drivers/bluetooth/ath3k.c b/trunk/drivers/bluetooth/ath3k.c
@@ -108,6 +108,7 @@ static int ath3k_probe(struct usb_interface *intf,
 {
 	const struct firmware *firmware;
 	struct usb_device *udev = interface_to_usbdev(intf);
+	int ret;
 
 	BT_DBG("intf %p id %p", intf, id);
 
@@ -118,13 +119,10 @@ static int ath3k_probe(struct usb_interface *intf,
 		return -EIO;
 	}
 
-	if (ath3k_load_firmware(udev, firmware)) {
-		release_firmware(firmware);
-		return -EIO;
-	}
+	ret = ath3k_load_firmware(udev, firmware);
 	release_firmware(firmware);
 
-	return 0;
+	return ret;
 }
 
 static void ath3k_disconnect(struct usb_interface *intf)