From 161840646c5b018031cdebbaa2918fdddc397bf2 Mon Sep 17 00:00:00 2001 From: Huaxu Wan Date: Fri, 25 Dec 2009 17:22:25 +0800 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 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 --- patches/16-bluetooth.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches/16-bluetooth.patch b/patches/16-bluetooth.patch index 7382856c94ec..3a79f84ded6d 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; -- 2.30.2