summaryrefslogtreecommitdiffstats
path: root/drivers/hid
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2014-04-01 19:11:09 +0200
committerJiri Kosina <jkosina@suse.cz>2014-04-01 19:11:09 +0200
commit3ae821effdfea47dcb36b52e0a8dffd9757a96a6 (patch)
tree34e5c8bc7d35c3727d9f029e5bd6205333bddbc9 /drivers/hid
parentfa1054a29b21e4c932b5c93def600149451cec32 (diff)
downloadlinux-3ae821effdfea47dcb36b52e0a8dffd9757a96a6.tar.bz2
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>
Diffstat (limited to 'drivers/hid')
-rw-r--r--drivers/hid/hid-sony.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c
index 4d348c069981..69204afea7a4 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)