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: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=3ae821effdfea47dcb36b52e0a8dffd9757a96a6;p=~emulex%2Finfiniband.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>
---

diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c
index 4d348c06998..69204afea7a 100644
--- a/drivers/hid/hid-sony.c
+++ b/drivers/hid/hid-sony.c
@@ -1680,10 +1680,6 @@ static int sony_probe(struct hid_device *hdev, const struct hid_device_id *id)
 			goto err_stop;
 	}
 
-	if (sc->quirks & SONY_FF_SUPPORT) {
-		ret = sony_init_ff(hdev);
-		if (ret < 0)
-			goto err_stop;
 	if (sc->quirks & SONY_BATTERY_SUPPORT) {
 		ret = sony_battery_probe(sc);
 		if (ret < 0)