git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
drivers
/
hid
/
hid-emsff.c
diff --git
a/drivers/hid/hid-emsff.c
b/drivers/hid/hid-emsff.c
index
81877c6
..
a5dc13f
100644
(file)
--- a/
drivers/hid/hid-emsff.c
+++ b/
drivers/hid/hid-emsff.c
@@
-126,7
+126,12
@@
static int ems_probe(struct hid_device *hdev, const struct hid_device_id *id)
goto err;
}
- emsff_init(hdev);
+ ret = emsff_init(hdev);
+ if (ret) {
+ dev_err(&hdev->dev, "force feedback init failed\n");
+ hid_hw_stop(hdev);
+ goto err;
+ }
return 0;
err: