Compat-wireless-2.6: Updated to fix bluetooth patch error
authorHuaxu Wan <huaxu.wan@linux.intel.com>
Fri, 25 Dec 2009 09:22:25 +0000 (17:22 +0800)
committerLuis R. Rodriguez <lrodriguez@atheros.com>
Tue, 29 Dec 2009 01:33:39 +0000 (17:33 -0800)
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

index 7382856c94ec19a8ef98fe458cc3f87d4ee28242..3a79f84ded6dc91f7b779e9da490757e1a64cbb9 100644 (file)
@@ -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;