From: Huaxu Wan <huaxu.wan@linux.intel.com>
Date: Fri, 25 Dec 2009 09:22:25 +0000 (+0800)
Subject: Compat-wireless-2.6: Updated to fix bluetooth patch error
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=161840646c5b018031cdebbaa2918fdddc397bf2;p=openwrt%2Fstaging%2Fblogic.git

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 <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>
---

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;