Update compat-wireless to 2.6.36-5-spn

chromeos/compat-wireless/net/bluetooth/hidp/core.c

 /*
    HIDP implementation for Linux Bluetooth stack (BlueZ).
    Copyright (C) 2003-2004 Marcel Holtmann <marcel@holtmann.org>
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License version 2 as
    published by the Free Software Foundation;
 
    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
    OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
@@ skipping 295 matching lines @@
 
         rsize = ((report->size - 1) >> 3) + 1 + (report->id > 0);
         if (rsize > sizeof(buf))
                 return -EIO;
 
         hid_output_report(report, buf);
 
         return hidp_queue_report(session, buf, rsize);
 }
 
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,27))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34))
 static int hidp_output_raw_report(struct hid_device *hid, unsigned char *data, size_t count,
                 unsigned char report_type)
 {
         switch (report_type) {
         case HID_FEATURE_REPORT:
                 report_type = HIDP_TRANS_SET_REPORT | HIDP_DATA_RTYPE_FEATURE;
                 break;
         case HID_OUTPUT_REPORT:
                 report_type = HIDP_TRANS_DATA | HIDP_DATA_RTYPE_OUPUT;
                 break;
         default:
                 return -EINVAL;
         }
 
         if (hidp_send_ctrl_message(hid->driver_data, report_type,
                         data, count))
                 return -ENOMEM;
         return count;
 }
+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,27))
+static int hidp_output_raw_report(struct hid_device *hid, unsigned char *data, size_t count)
+{
+        if (hidp_send_ctrl_message(hid->driver_data,
+                        HIDP_TRANS_SET_REPORT | HIDP_DATA_RTYPE_FEATURE,
+                        data, count))
+                return -ENOMEM;
+        return count;
+}
 #endif
 
 static void hidp_idle_timeout(unsigned long arg)
 {
         struct hidp_session *session = (struct hidp_session *) arg;
 
         atomic_inc(&session->terminate);
         hidp_schedule(session);
 }
 
@@ skipping 245 matching lines @@
 
         down_write(&hidp_session_sem);
 
         hidp_del_timer(session);
 
         if (session->input) {
                 input_unregister_device(session->input);
                 session->input = NULL;
         }
 
-  if (session->hid) {
+        if (session->hid) {
 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,27))
-    hid_destroy_device(session->hid);
-    session->hid = NULL;
+                hid_destroy_device(session->hid);
+                session->hid = NULL;
 #else
-    if (session->hid->claimed & HID_CLAIMED_INPUT)
-      hidinput_disconnect(session->hid);
-    hid_free_device(session->hid);
+                if (session->hid->claimed & HID_CLAIMED_INPUT)
+                        hidinput_disconnect(session->hid);
+                hid_free_device(session->hid);
 #endif
-  }
+        }
 
         /* Wakeup user-space polling for socket errors */
         session->intr_sock->sk->sk_err = EUNATCH;
         session->ctrl_sock->sk->sk_err = EUNATCH;
 
         hidp_schedule(session);
 
         fput(session->intr_sock->file);
 
         wait_event_timeout(*(sk_sleep(ctrl_sk)),
@@ skipping 556 matching lines @@
 }
 
 module_init(hidp_init);
 module_exit(hidp_exit);
 
 MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>");
 MODULE_DESCRIPTION("Bluetooth HIDP ver " VERSION);
 MODULE_VERSION(VERSION);
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("bt-proto-6");