git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
drivers
/
bluetooth
/
bcm203x.c
diff --git
a/drivers/bluetooth/bcm203x.c
b/drivers/bluetooth/bcm203x.c
index
02a95b2
..
5fd3e4c
100644
(file)
--- a/
drivers/bluetooth/bcm203x.c
+++ b/
drivers/bluetooth/bcm203x.c
@@
-2,6
+2,7
@@
*
* Broadcom Blutonium firmware driver
*
*
* Broadcom Blutonium firmware driver
*
+ * Copyright (C) 2003 Maxim Krasnyansky <maxk@qualcomm.com>
* Copyright (C) 2003 Marcel Holtmann <marcel@holtmann.org>
*
*
* Copyright (C) 2003 Marcel Holtmann <marcel@holtmann.org>
*
*
@@
-45,6
+46,8
@@
#define VERSION "1.0"
#define VERSION "1.0"
+static int ignore = 0;
+
static struct usb_device_id bcm203x_table[] = {
/* Broadcom Blutonium (BCM2033) */
{ USB_DEVICE(0x0a5c, 0x2033) },
static struct usb_device_id bcm203x_table[] = {
/* Broadcom Blutonium (BCM2033) */
{ USB_DEVICE(0x0a5c, 0x2033) },
@@
-54,7
+57,6
@@
static struct usb_device_id bcm203x_table[] = {
MODULE_DEVICE_TABLE(usb, bcm203x_table);
MODULE_DEVICE_TABLE(usb, bcm203x_table);
-
#define BCM203X_ERROR 0
#define BCM203X_RESET 1
#define BCM203X_LOAD_MINIDRV 2
#define BCM203X_ERROR 0
#define BCM203X_RESET 1
#define BCM203X_LOAD_MINIDRV 2
@@
-174,7
+176,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
ntf->altsetting->desc.bInterfaceNumber != 0
)
+ if (i
gnore || (intf->cur_altsetting->desc.bInterfaceNumber != 0)
)
return -ENODEV;
data = kmalloc(sizeof(*data), GFP_KERNEL);
return -ENODEV;
data = kmalloc(sizeof(*data), GFP_KERNEL);
@@
-264,7
+266,7
@@
static void bcm203x_disconnect(struct usb_interface *intf)
BT_DBG("intf %p", intf);
BT_DBG("intf %p", intf);
- usb_
unlink
_urb(data->urb);
+ usb_
kill
_urb(data->urb);
usb_set_intfdata(intf, NULL);
usb_set_intfdata(intf, NULL);
@@
-303,6
+305,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_AUTHOR("Marcel Holtmann <marcel@holtmann.org>");
MODULE_DESCRIPTION("Broadcom Blutonium firmware driver ver " VERSION);
MODULE_VERSION(VERSION);