2009-12-25 09:20:45

by Huaxu Wan

Subject: [PATCH] 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.

Signed-off-by: Huaxu Wan <[email protected]>

---
patches/16-bluetooth.patch | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/patches/16-bluetooth.patch b/patches/16-bluetooth.patch
index 7382856..3a79f84 100644
--- a/patches/16-bluetooth.patch
+++ b/patches/16-bluetooth.patch
@@ -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;
--
1.6.3.3

2009-12-29 02:00:49

by Luis Chamberlain

Subject: Re: [PATCH] Compat-wireless-2.6: Updated to fix bluetooth patch error

On Fri, Dec 25, 2009 at 05:22:25PM +0800, Huaxu Wan wrote:
>
> 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.
>
> Signed-off-by: Huaxu Wan <[email protected]>

Great thanks!

Luis