projects
/
platform
/
kernel
/
linux-rpi3.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fa1054a
)
HID: sony: fix force feedback mismerge
author
Jiri Kosina
<jkosina@suse.cz>
Tue, 1 Apr 2014 17:11:09 +0000
(19:11 +0200)
committer
Jiri Kosina
<jkosina@suse.cz>
Tue, 1 Apr 2014 17:11:09 +0000
(19:11 +0200)
Fix unfortunate mismerge between the fixes and sony branch causing
code duplication and unterminated basic block.
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
drivers/hid/hid-sony.c
patch
|
blob
|
history
diff --git
a/drivers/hid/hid-sony.c
b/drivers/hid/hid-sony.c
index
4d348c0
..
69204af
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)