projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[cascardo/linux.git]
/
drivers
/
bluetooth
/
bcm203x.c
diff --git
a/drivers/bluetooth/bcm203x.c
b/drivers/bluetooth/bcm203x.c
index
5167517
..
8919ccf
100644
(file)
--- a/
drivers/bluetooth/bcm203x.c
+++ b/
drivers/bluetooth/bcm203x.c
@@
-157,9
+157,10
@@
static void bcm203x_complete(struct urb *urb)
}
}
}
}
-static void bcm203x_work(
void *user_data
)
+static void bcm203x_work(
struct work_struct *work
)
{
{
- struct bcm203x_data *data = user_data;
+ struct bcm203x_data *data =
+ container_of(work, struct bcm203x_data, work);
if (usb_submit_urb(data->urb, GFP_ATOMIC) < 0)
BT_ERR("Can't submit URB");
if (usb_submit_urb(data->urb, GFP_ATOMIC) < 0)
BT_ERR("Can't submit URB");
@@
-246,7
+247,7
@@
static int bcm203x_probe(struct usb_interface *intf, const struct usb_device_id
release_firmware(firmware);
release_firmware(firmware);
- INIT_WORK(&data->work, bcm203x_work
, (void *) data
);
+ INIT_WORK(&data->work, bcm203x_work);
usb_set_intfdata(intf, data);
usb_set_intfdata(intf, data);
@@
-306,3
+307,5
@@
MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>");
MODULE_DESCRIPTION("Broadcom Blutonium firmware driver ver " VERSION);
MODULE_VERSION(VERSION);
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("Broadcom Blutonium firmware driver ver " VERSION);
MODULE_VERSION(VERSION);
MODULE_LICENSE("GPL");
+MODULE_FIRMWARE("BCM2033-MD.hex");
+MODULE_FIRMWARE("BCM2033-FW.bin");