projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: fa1054a) | patch
HID: sony: fix force feedback mismerge
authorJiri Kosina <jkosina@suse.cz>
Tue, 1 Apr 2014 17:11:09 +0000 (19:11 +0200)
committerJiri Kosina <jkosina@suse.cz>
Tue, 1 Apr 2014 17:11:09 +0000 (19:11 +0200)
commit3ae821effdfea47dcb36b52e0a8dffd9757a96a6
tree34e5c8bc7d35c3727d9f029e5bd6205333bddbc9tree | snapshot
parentfa1054a29b21e4c932b5c93def600149451cec32commit | diff
HID: sony: fix force feedback mismerge

Fix unfortunate mismerge between the fixes and sony branch causing
code duplication and unterminated basic block.

Signed-off-by: Jiri Kosina <jkosina@suse.cz>
drivers/hid/hid-sony.c diff | blob | history
John Crispins staging tree