* [PATCH] Compat-wireless-2.6: Updated to fix bluetooth patch error
@ 2009-12-25 9:22 Huaxu Wan
2009-12-29 2:00 ` Luis R. Rodriguez
0 siblings, 1 reply; 2+ messages in thread
From: Huaxu Wan @ 2009-12-25 9:22 UTC (permalink / raw)
To: Luis R. Rodriguez; +Cc: linux-wireless
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 <roel.kluin@gmail.com>
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 <huaxu.wan@linux.intel.com>
---
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
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] Compat-wireless-2.6: Updated to fix bluetooth patch error
2009-12-25 9:22 [PATCH] Compat-wireless-2.6: Updated to fix bluetooth patch error Huaxu Wan
@ 2009-12-29 2:00 ` Luis R. Rodriguez
0 siblings, 0 replies; 2+ messages in thread
From: Luis R. Rodriguez @ 2009-12-29 2:00 UTC (permalink / raw)
To: Huaxu Wan; +Cc: Luis R. Rodriguez, linux-wireless
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 <roel.kluin@gmail.com>
> 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 <huaxu.wan@linux.intel.com>
Great thanks!
Luis
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-12-29 2:00 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-12-25 9:22 [PATCH] Compat-wireless-2.6: Updated to fix bluetooth patch error Huaxu Wan
2009-12-29 2:00 ` Luis R. Rodriguez
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).