]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: cf66dce) | 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)
commit6114ce3001ae1866d0157dea6fd76dd7e70b125b
tree34e5c8bc7d35c3727d9f029e5bd6205333bddbc9tree | snapshot
parentcf66dce680761731c954d575d79bb832d338a14bcommit | 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
Linux Kernel Source Tree.