diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2013-10-28 19:21:15 +0100 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2013-10-28 20:53:49 +0100 |
commit | f512003b9ffec176e67f79b362c87b405962f4e9 (patch) | |
tree | 6cbb64b755c5e66e2a80d1526f3e76cf4a50d0ee /patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hidp_core.patch | |
parent | 13da9861852d8790abb8e64faa4ad48469ff6b59 (diff) |
backports: refresh patches on v3.10.17
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.98 [ OK ]
17 3.1.10 [ OK ]
18 3.10.14 [ FAIL ]
19 3.11.3 [ FAIL ]
20 3.12-rc3 [ FAIL ]
21 3.2.51 [ OK ]
22 3.3.8 [ OK ]
23 3.4.64 [ OK ]
24 3.5.7 [ OK ]
25 3.6.11 [ OK ]
26 3.7.10 [ OK ]
27 3.8.13 [ OK ]
28 3.9.11 [ OK ]
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 | 12 |
1 files changed, 6 insertions, 6 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 7333764b..102b9361 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 @@ -1,6 +1,6 @@ --- a/net/bluetooth/hidp/core.c +++ b/net/bluetooth/hidp/core.c -@@ -329,6 +329,7 @@ err: +@@ -334,6 +334,7 @@ err: return ret; } @@ -8,7 +8,7 @@ static int hidp_output_raw_report(struct hid_device *hid, unsigned char *data, size_t count, unsigned char report_type) { -@@ -386,6 +387,16 @@ err: +@@ -391,6 +392,16 @@ err: mutex_unlock(&session->report_mutex); return ret; } @@ -25,7 +25,7 @@ static void hidp_idle_timeout(unsigned long arg) { -@@ -674,6 +685,87 @@ static void hidp_close(struct hid_device +@@ -679,6 +690,87 @@ static void hidp_close(struct hid_device { } @@ -113,7 +113,7 @@ static int hidp_parse(struct hid_device *hid) { struct hidp_session *session = hid->driver_data; -@@ -764,7 +856,9 @@ static int hidp_setup_hid(struct hidp_se +@@ -769,7 +861,9 @@ static int hidp_setup_hid(struct hidp_se hid->dev.parent = &session->conn->hcon->dev; hid->ll_driver = &hidp_hid_driver; @@ -123,7 +123,7 @@ hid->hid_output_raw_report = hidp_output_raw_report; /* True if device is blacklisted in drivers/hid/hid-core.c */ -@@ -782,6 +876,7 @@ fault: +@@ -787,6 +881,7 @@ fault: return err; } @@ -131,7 +131,7 @@ /* initialize session devices */ static int hidp_session_dev_init(struct hidp_session *session, -@@ -844,10 +939,17 @@ static int hidp_session_dev_add(struct h +@@ -849,10 +944,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) { |