iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bluetooth: ath3k: output firmware filename when request_firmware failed

Browse Source 
This makes it much easier for the users to understand why the driver
refuses to load when the firmware is unavailable.

Signed-off-by: Paul Fertser <fercerpav@gmail.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
This commit is contained in:
Paul Fertser 2011-10-29 21:52:49 +04:00 committed by Gustavo F. Padovan
parent 59735631d2
commit c3eae82a84
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/bluetooth/ath3k.c
View File

@ -30,6 +30,7 @@
#include <net/bluetooth/bluetooth.h> #include <net/bluetooth/bluetooth.h>
#define VERSION "1.0" #define VERSION "1.0"
#define ATH3K_FIRMWARE "ath3k-1.fw"
#define ATH3K_DNLOAD 0x01 #define ATH3K_DNLOAD 0x01
#define ATH3K_GETSTATE 0x05 #define ATH3K_GETSTATE 0x05
@ -400,9 +401,15 @@ static int ath3k_probe(struct usb_interface *intf,
return 0; return 0;
} }
if (request_firmware(&firmware, "ath3k-1.fw", &udev->dev) < 0) { ret = request_firmware(&firmware, ATH3K_FIRMWARE, &udev->dev);
BT_ERR("Error loading firmware"); if (ret < 0) {
return -EIO; if (ret == -ENOENT)
BT_ERR("Firmware file \"%s\" not found",
ATH3K_FIRMWARE);
else
BT_ERR("Firmware file \"%s\" request failed (err=%d)",
ATH3K_FIRMWARE, ret);
return ret;
} }
ret = ath3k_load_firmware(udev, firmware); ret = ath3k_load_firmware(udev, firmware);
@ -441,4 +448,4 @@ MODULE_AUTHOR("Atheros Communications");
MODULE_DESCRIPTION("Atheros AR30xx firmware driver"); MODULE_DESCRIPTION("Atheros AR30xx firmware driver");
MODULE_VERSION(VERSION); MODULE_VERSION(VERSION);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_FIRMWARE("ath3k-1.fw"); MODULE_FIRMWARE(ATH3K_FIRMWARE);