From 3ae821effdfea47dcb36b52e0a8dffd9757a96a6 Mon Sep 17 00:00:00 2001
From: Jiri Kosina <jkosina@suse.cz>
Date: Tue, 1 Apr 2014 19:11:09 +0200
Subject: [PATCH] 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-format-patch failed