OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
18fc216
040fc00
)
Merge branch 'for-4.12/sony' into for-linus
author
Jiri Kosina
<jkosina@suse.cz>
Tue, 2 May 2017 09:02:24 +0000
(11:02 +0200)
committer
Jiri Kosina
<jkosina@suse.cz>
Tue, 2 May 2017 09:02:24 +0000
(11:02 +0200)
1
2
drivers/hid/hid-sony.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/hid/hid-sony.c
index
740996f
,
43213d6
..
d03203a
---
1
/
drivers/hid/hid-sony.c
---
2
/
drivers/hid/hid-sony.c
+++ b/
drivers/hid/hid-sony.c
@@@
-2632,8
-2693,8
+2693,10
@@@
err_stop
sony_leds_remove(sc);
if (sc->quirks & SONY_BATTERY_SUPPORT)
sony_battery_remove(sc);
+ if (sc->touchpad)
+ sony_unregister_touchpad(sc);
+ if (sc->sensor_dev)
+ sony_unregister_sensors(sc);
sony_cancel_work_sync(sc);
kfree(sc->output_report_dmabuf);
sony_remove_dev_list(sc);