diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2014-02-07 19:34:18 +0100 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-02-08 13:34:15 +0100 |
commit | 40e9a2135f6dedda98f9032f9f9c564140ce6c63 (patch) | |
tree | 7620410c493019fbd9f8b0efedad8d945012e089 /patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hidp_core.patch | |
parent | e28d3120e9f85758763497542e7d10c8aa6ddfaa (diff) |
backports: refresh patches on next-20140207backports-20140207
1 2.6.25 [ OK ]
2 2.6.26 [ OK ]
3 2.6.27 [ OK ]
4 2.6.28 [ OK ]
5 2.6.29 [ OK ]
6 2.6.30 [ OK ]
7 2.6.31 [ OK ]
8 2.6.32 [ OK ]
9 2.6.33 [ OK ]
10 2.6.34 [ OK ]
11 2.6.35 [ OK ]
12 2.6.36 [ OK ]
13 2.6.37 [ OK ]
14 2.6.38 [ OK ]
15 2.6.39 [ OK ]
16 3.0.101 [ OK ]
17 3.1.10 [ OK ]
18 3.2.54 [ OK ]
19 3.3.8 [ OK ]
20 3.4.79 [ OK ]
21 3.5.7 [ OK ]
22 3.6.11 [ OK ]
23 3.7.10 [ OK ]
24 3.8.13 [ OK ]
25 3.9.11 [ OK ]
26 3.10.29 [ OK ]
27 3.11.10 [ OK ]
28 3.12.10 [ OK ]
29 3.13.2 [ OK ]
30 3.14-rc1 [ OK ]
Manual changes were needed in
patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hidp_core.patch
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hidp_core.patch')
-rw-r--r-- | patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hidp_core.patch | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hidp_core.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hidp_core.patch index 29dca32c..068243f1 100644 --- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hidp_core.patch +++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hidp_core.patch @@ -8,17 +8,23 @@ static int hidp_get_raw_report(struct hid_device *hid, unsigned char report_number, unsigned char *data, size_t count, -@@ -352,7 +353,9 @@ err: +@@ -352,6 +353,7 @@ err: mutex_unlock(&session->report_mutex); return ret; } +#endif /* (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,38)) */ + static int hidp_set_raw_report(struct hid_device *hid, unsigned char reportnum, + unsigned char *data, size_t count, +@@ -418,6 +420,7 @@ err: + return ret; + } + +#if defined(CPTCFG_BACKPORT_OPTION_BT_SOCK_CREATE_NEEDS_KERN) static int hidp_output_raw_report(struct hid_device *hid, unsigned char *data, size_t count, unsigned char report_type) { -@@ -410,6 +413,16 @@ err: +@@ -475,6 +478,16 @@ err: mutex_unlock(&session->report_mutex); return ret; } @@ -33,9 +39,9 @@ +} +#endif - static void hidp_idle_timeout(unsigned long arg) - { -@@ -698,6 +711,87 @@ static void hidp_close(struct hid_device + static int hidp_raw_request(struct hid_device *hid, unsigned char reportnum, + __u8 *buf, size_t len, unsigned char rtype, +@@ -786,6 +799,87 @@ static void hidp_close(struct hid_device { } @@ -123,7 +129,7 @@ static int hidp_parse(struct hid_device *hid) { struct hidp_session *session = hid->driver_data; -@@ -775,7 +869,9 @@ static int hidp_setup_hid(struct hidp_se +@@ -865,7 +959,9 @@ static int hidp_setup_hid(struct hidp_se hid->dev.parent = &session->conn->hcon->dev; hid->ll_driver = &hidp_hid_driver; @@ -133,7 +139,7 @@ hid->hid_output_raw_report = hidp_output_raw_report; /* True if device is blacklisted in drivers/hid/hid-core.c */ -@@ -793,6 +889,7 @@ fault: +@@ -883,6 +979,7 @@ fault: return err; } @@ -141,7 +147,7 @@ /* initialize session devices */ static int hidp_session_dev_init(struct hidp_session *session, -@@ -855,10 +952,17 @@ static int hidp_session_dev_add(struct h +@@ -945,10 +1042,17 @@ static int hidp_session_dev_add(struct h /* remove HID/input devices from their bus systems */ static void hidp_session_dev_del(struct hidp_session *session) { |