git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[Bluetooth] Fix double frees on error paths of btusb and bpa10x drivers
[pandora-kernel.git]
/
drivers
/
bluetooth
/
bcm203x.c
diff --git
a/drivers/bluetooth/bcm203x.c
b/drivers/bluetooth/bcm203x.c
index
5167517
..
ee40201
100644
(file)
--- a/
drivers/bluetooth/bcm203x.c
+++ b/
drivers/bluetooth/bcm203x.c
@@
-42,9
+42,7
@@
#define BT_DBG(D...)
#endif
#define BT_DBG(D...)
#endif
-#define VERSION "1.1"
-
-static int ignore = 0;
+#define VERSION "1.2"
static struct usb_device_id bcm203x_table[] = {
/* Broadcom Blutonium (BCM2033) */
static struct usb_device_id bcm203x_table[] = {
/* Broadcom Blutonium (BCM2033) */
@@
-157,9
+155,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");
@@
-174,7
+173,7
@@
static int bcm203x_probe(struct usb_interface *intf, const struct usb_device_id
BT_DBG("intf %p id %p", intf, id);
BT_DBG("intf %p id %p", intf, id);
- if (i
gnore || (intf->cur_altsetting->desc.bInterfaceNumber != 0)
)
+ if (i
ntf->cur_altsetting->desc.bInterfaceNumber != 0
)
return -ENODEV;
data = kzalloc(sizeof(*data), GFP_KERNEL);
return -ENODEV;
data = kzalloc(sizeof(*data), GFP_KERNEL);
@@
-246,7
+245,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);
@@
-299,10
+298,9
@@
static void __exit bcm203x_exit(void)
module_init(bcm203x_init);
module_exit(bcm203x_exit);
module_init(bcm203x_init);
module_exit(bcm203x_exit);
-module_param(ignore, bool, 0644);
-MODULE_PARM_DESC(ignore, "Ignore devices from the matching table");
-
MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>");
MODULE_DESCRIPTION("Broadcom Blutonium firmware driver ver " VERSION);
MODULE_VERSION(VERSION);
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>");
MODULE_DESCRIPTION("Broadcom Blutonium firmware driver ver " VERSION);
MODULE_VERSION(VERSION);
MODULE_LICENSE("GPL");
+MODULE_FIRMWARE("BCM2033-MD.hex");
+MODULE_FIRMWARE("BCM2033-FW.bin");