Skip to content

Commit

Permalink
Bluetooth: ath3k: output firmware filename when request_firmware failed
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Paul Fertser authored and Gustavo F. Padovan committed Nov 7, 2011
1 parent 5973563 commit c3eae82
Showing 1 changed file with 11 additions and 4 deletions.
15 changes: 11 additions & 4 deletions drivers/bluetooth/ath3k.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
#include <net/bluetooth/bluetooth.h>

#define VERSION "1.0"
#define ATH3K_FIRMWARE "ath3k-1.fw"

#define ATH3K_DNLOAD 0x01
#define ATH3K_GETSTATE 0x05
Expand Down Expand Up @@ -400,9 +401,15 @@ static int ath3k_probe(struct usb_interface *intf,
return 0;
}

if (request_firmware(&firmware, "ath3k-1.fw", &udev->dev) < 0) {
BT_ERR("Error loading firmware");
return -EIO;
ret = request_firmware(&firmware, ATH3K_FIRMWARE, &udev->dev);
if (ret < 0) {
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);
Expand Down Expand Up @@ -441,4 +448,4 @@ MODULE_AUTHOR("Atheros Communications");
MODULE_DESCRIPTION("Atheros AR30xx firmware driver");
MODULE_VERSION(VERSION);
MODULE_LICENSE("GPL");
MODULE_FIRMWARE("ath3k-1.fw");
MODULE_FIRMWARE(ATH3K_FIRMWARE);

0 comments on commit c3eae82

Please sign in to comment.