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
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
bluetooth
/
bcm203x.c
diff --git
a/drivers/bluetooth/bcm203x.c
b/drivers/bluetooth/bcm203x.c
index
1de3304
..
3e7a067
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,17
+176,15
@@
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->cur_altsetting->desc.bInterfaceNumber != 0
)
+ if (i
gnore || (intf->cur_altsetting->desc.bInterfaceNumber != 0)
)
return -ENODEV;
return -ENODEV;
- data = k
m
alloc(sizeof(*data), GFP_KERNEL);
+ data = k
z
alloc(sizeof(*data), GFP_KERNEL);
if (!data) {
BT_ERR("Can't allocate memory for data structure");
return -ENOMEM;
}
if (!data) {
BT_ERR("Can't allocate memory for data structure");
return -ENOMEM;
}
- memset(data, 0, sizeof(*data));
-
data->udev = udev;
data->state = BCM203X_LOAD_MINIDRV;
data->udev = udev;
data->state = BCM203X_LOAD_MINIDRV;
@@
-264,7
+264,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);
@@
-275,7
+275,6
@@
static void bcm203x_disconnect(struct usb_interface *intf)
}
static struct usb_driver bcm203x_driver = {
}
static struct usb_driver bcm203x_driver = {
- .owner = THIS_MODULE,
.name = "bcm203x",
.probe = bcm203x_probe,
.disconnect = bcm203x_disconnect,
.name = "bcm203x",
.probe = bcm203x_probe,
.disconnect = bcm203x_disconnect,
@@
-303,6
+302,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);