Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1)

Unified Diff: chromeos/compat-wireless/net/bluetooth/hidp/core.c

Issue 5326002: Update compat-wireless to 2.6.36-5-spn (Closed) Base URL: http://git.chromium.org/git/kernel.git@master
Patch Set: Fixes for !ACK handling, missing local changes, log message fixes Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chromeos/compat-wireless/net/bluetooth/hidp/core.c
diff --git a/chromeos/compat-wireless/net/bluetooth/hidp/core.c b/chromeos/compat-wireless/net/bluetooth/hidp/core.c
index d31681bd2b98ca12eacc18a43f44d9907b6b5dcc..0105eef6d6b036fcd329deb3d79d4c66783ca2f3 100644
--- a/chromeos/compat-wireless/net/bluetooth/hidp/core.c
+++ b/chromeos/compat-wireless/net/bluetooth/hidp/core.c
@@ -313,7 +313,7 @@ static int hidp_send_report(struct hidp_session *session, struct hid_report *rep
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)
{
@@ -333,6 +333,15 @@ static int hidp_output_raw_report(struct hid_device *hid, unsigned char *data, s
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)
@@ -598,16 +607,16 @@ static int hidp_session(void *arg)
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;

Powered by Google App Engine
This is Rietveld 408576698