From: Jiri Kosina <jkosina@suse.cz>
Date: Tue, 1 Apr 2014 17:11:09 +0000 (+0200)
Subject: HID: sony: fix force feedback mismerge
X-Git-Tag: v3.15-rc1~114^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ae821effdfea47dcb36b52e0a8dffd9757a96a6;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed