Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
742201e7
Commit
742201e7
authored
Oct 07, 2008
by
David S. Miller
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6
parents
53240c20
1305e9e7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
drivers/bluetooth/bpa10x.c
drivers/bluetooth/bpa10x.c
+0
-2
drivers/bluetooth/btusb.c
drivers/bluetooth/btusb.c
+5
-3
No files found.
drivers/bluetooth/bpa10x.c
View file @
742201e7
...
@@ -256,7 +256,6 @@ static inline int bpa10x_submit_intr_urb(struct hci_dev *hdev)
...
@@ -256,7 +256,6 @@ static inline int bpa10x_submit_intr_urb(struct hci_dev *hdev)
BT_ERR
(
"%s urb %p submission failed (%d)"
,
BT_ERR
(
"%s urb %p submission failed (%d)"
,
hdev
->
name
,
urb
,
-
err
);
hdev
->
name
,
urb
,
-
err
);
usb_unanchor_urb
(
urb
);
usb_unanchor_urb
(
urb
);
kfree
(
buf
);
}
}
usb_free_urb
(
urb
);
usb_free_urb
(
urb
);
...
@@ -298,7 +297,6 @@ static inline int bpa10x_submit_bulk_urb(struct hci_dev *hdev)
...
@@ -298,7 +297,6 @@ static inline int bpa10x_submit_bulk_urb(struct hci_dev *hdev)
BT_ERR
(
"%s urb %p submission failed (%d)"
,
BT_ERR
(
"%s urb %p submission failed (%d)"
,
hdev
->
name
,
urb
,
-
err
);
hdev
->
name
,
urb
,
-
err
);
usb_unanchor_urb
(
urb
);
usb_unanchor_urb
(
urb
);
kfree
(
buf
);
}
}
usb_free_urb
(
urb
);
usb_free_urb
(
urb
);
...
...
drivers/bluetooth/btusb.c
View file @
742201e7
...
@@ -102,6 +102,7 @@ static struct usb_device_id blacklist_table[] = {
...
@@ -102,6 +102,7 @@ static struct usb_device_id blacklist_table[] = {
{
USB_DEVICE
(
0x0a5c
,
0x2101
),
.
driver_info
=
BTUSB_RESET
|
BTUSB_WRONG_SCO_MTU
},
{
USB_DEVICE
(
0x0a5c
,
0x2101
),
.
driver_info
=
BTUSB_RESET
|
BTUSB_WRONG_SCO_MTU
},
/* Broadcom BCM2046 */
/* Broadcom BCM2046 */
{
USB_DEVICE
(
0x0a5c
,
0x2146
),
.
driver_info
=
BTUSB_RESET
},
{
USB_DEVICE
(
0x0a5c
,
0x2151
),
.
driver_info
=
BTUSB_RESET
},
{
USB_DEVICE
(
0x0a5c
,
0x2151
),
.
driver_info
=
BTUSB_RESET
},
/* Apple MacBook Pro with Broadcom chip */
/* Apple MacBook Pro with Broadcom chip */
...
@@ -113,6 +114,7 @@ static struct usb_device_id blacklist_table[] = {
...
@@ -113,6 +114,7 @@ static struct usb_device_id blacklist_table[] = {
/* Targus ACB10US */
/* Targus ACB10US */
{
USB_DEVICE
(
0x0a5c
,
0x2100
),
.
driver_info
=
BTUSB_RESET
},
{
USB_DEVICE
(
0x0a5c
,
0x2100
),
.
driver_info
=
BTUSB_RESET
},
{
USB_DEVICE
(
0x0a5c
,
0x2154
),
.
driver_info
=
BTUSB_RESET
},
/* ANYCOM Bluetooth USB-200 and USB-250 */
/* ANYCOM Bluetooth USB-200 and USB-250 */
{
USB_DEVICE
(
0x0a5c
,
0x2111
),
.
driver_info
=
BTUSB_RESET
},
{
USB_DEVICE
(
0x0a5c
,
0x2111
),
.
driver_info
=
BTUSB_RESET
},
...
@@ -150,6 +152,9 @@ static struct usb_device_id blacklist_table[] = {
...
@@ -150,6 +152,9 @@ static struct usb_device_id blacklist_table[] = {
{
USB_DEVICE
(
0x050d
,
0x0012
),
.
driver_info
=
BTUSB_RESET
|
BTUSB_WRONG_SCO_MTU
},
{
USB_DEVICE
(
0x050d
,
0x0012
),
.
driver_info
=
BTUSB_RESET
|
BTUSB_WRONG_SCO_MTU
},
{
USB_DEVICE
(
0x050d
,
0x0013
),
.
driver_info
=
BTUSB_RESET
|
BTUSB_WRONG_SCO_MTU
},
{
USB_DEVICE
(
0x050d
,
0x0013
),
.
driver_info
=
BTUSB_RESET
|
BTUSB_WRONG_SCO_MTU
},
/* Belkin F8T016 device */
{
USB_DEVICE
(
0x050d
,
0x016a
),
.
driver_info
=
BTUSB_RESET
},
/* Digianswer devices */
/* Digianswer devices */
{
USB_DEVICE
(
0x08fd
,
0x0001
),
.
driver_info
=
BTUSB_DIGIANSWER
},
{
USB_DEVICE
(
0x08fd
,
0x0001
),
.
driver_info
=
BTUSB_DIGIANSWER
},
{
USB_DEVICE
(
0x08fd
,
0x0002
),
.
driver_info
=
BTUSB_IGNORE
},
{
USB_DEVICE
(
0x08fd
,
0x0002
),
.
driver_info
=
BTUSB_IGNORE
},
...
@@ -271,7 +276,6 @@ static int btusb_submit_intr_urb(struct hci_dev *hdev)
...
@@ -271,7 +276,6 @@ static int btusb_submit_intr_urb(struct hci_dev *hdev)
BT_ERR
(
"%s urb %p submission failed (%d)"
,
BT_ERR
(
"%s urb %p submission failed (%d)"
,
hdev
->
name
,
urb
,
-
err
);
hdev
->
name
,
urb
,
-
err
);
usb_unanchor_urb
(
urb
);
usb_unanchor_urb
(
urb
);
kfree
(
buf
);
}
}
usb_free_urb
(
urb
);
usb_free_urb
(
urb
);
...
@@ -354,7 +358,6 @@ static int btusb_submit_bulk_urb(struct hci_dev *hdev)
...
@@ -354,7 +358,6 @@ static int btusb_submit_bulk_urb(struct hci_dev *hdev)
BT_ERR
(
"%s urb %p submission failed (%d)"
,
BT_ERR
(
"%s urb %p submission failed (%d)"
,
hdev
->
name
,
urb
,
-
err
);
hdev
->
name
,
urb
,
-
err
);
usb_unanchor_urb
(
urb
);
usb_unanchor_urb
(
urb
);
kfree
(
buf
);
}
}
usb_free_urb
(
urb
);
usb_free_urb
(
urb
);
...
@@ -475,7 +478,6 @@ static int btusb_submit_isoc_urb(struct hci_dev *hdev)
...
@@ -475,7 +478,6 @@ static int btusb_submit_isoc_urb(struct hci_dev *hdev)
BT_ERR
(
"%s urb %p submission failed (%d)"
,
BT_ERR
(
"%s urb %p submission failed (%d)"
,
hdev
->
name
,
urb
,
-
err
);
hdev
->
name
,
urb
,
-
err
);
usb_unanchor_urb
(
urb
);
usb_unanchor_urb
(
urb
);
kfree
(
buf
);
}
}
usb_free_urb
(
urb
);
usb_free_urb
(
urb
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment