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 4d348c069981f21b51c12aabfea9f4fdaa342952..69204afea7a48384d7bda840808b5c66b0988b60 100644 (file)
--- 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)