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>
mariux64 · Apr 1, 2014 · 3ae821e · 3ae821e
1 parent fa1054a
commit 3ae821e
Showing 1 changed file with 0 additions and 4 deletions.
diff --git 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)