Skip to contentSkip to conversation

Compat-wireless-2.6: Updated to fix bluetooth patch error

PATCH In review Huaxu Wan 2 participants 2 messages Dec 25, 2009 – Dec 29, 2009

lore
Share & tools
lore

Huaxu Wan

author
#0 lore raw

PATCH 1/1 Compat-wireless-2.6: Updated to fix bluetooth patch error

Compat-wireless-2.6: Updated to fix bluetooth patch error

Keep the patch in step with the linux-next tree after the following patch merged.

commit 971beb83aeb2a309175682cf5683d64fd4591841
Author: Roel Kluin <[email protected]>
Date: Mon Dec 7 14:23:21 2009 +0100

Bluetooth: Fix PTR_ERR return of wrong pointer in hidp_setup_hid()

Return the PTR_ERR of the correct pointer.

---
 patches/16-bluetooth.patch |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
patches/16-bluetooth.patch +1 -1
index 7382856..3a79f84 100644
@@ -200,7 +200,7 @@ diff -Nur a/net/bluetooth/hci_sysfs.c b/net/bluetooth/hci_sysfs.c
 +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,27))
  	hid = hid_allocate_device();
  	if (IS_ERR(hid))
- 		return PTR_ERR(session->hid);
+ 		return PTR_ERR(hid);
 +#endif
  
  	session->hid = hid;
Signature · 1 line
1.6.3.3
#1 lore raw
Quoted 10 lines · Huaxu Wan

Compat-wireless-2.6: Updated to fix bluetooth patch error

Keep the patch in step with the linux-next tree after the following patch merged.

commit 971beb83aeb2a309175682cf5683d64fd4591841
Author: Roel Kluin <[email protected]>
Date: Mon Dec 7 14:23:21 2009 +0100

Quoted 5 lines

Bluetooth: Fix PTR_ERR return of wrong pointer in hidp_setup_hid()

Return the PTR_ERR of the correct pointer.

Great thanks!

Luis