diff options
| author | Vinayak Pane <vpane@nvidia.com> | 2014-06-30 19:45:45 -0700 |
|---|---|---|
| committer | Mandar Padmawar <mpadmawar@nvidia.com> | 2014-07-10 02:05:27 -0700 |
| commit | 4352ee53c89a2e406d5ab8d608754bc8aeabec06 (patch) | |
| tree | 2fbe95922c0fad3bac5c3b94656649056cf7f88b | |
| parent | 1776b8cf2a113ca464deca53e9cb19d0a454bcb7 (diff) | |
HID: fix bad merge in probe function
Force feedback should be enabled at hid-probe.
This has been caused by bad merge http://git-master/r/#/c/409169/
Change-Id: I5a9e97f2b489cfd0c1a988abd3c0a599ed226dd1
Signed-off-by: Vinayak Pane <vpane@nvidia.com>
Reviewed-on: http://git-master/r/432986
(cherry picked from commit b8970d8083860a0a3b83c872bc4c2de255b74b9b)
Reviewed-on: http://git-master/r/435727
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Anshul Jain (SW) <anshulj@nvidia.com>
Tested-by: Anshul Jain (SW) <anshulj@nvidia.com>
| -rw-r--r-- | drivers/hid/hid-nvidia-blake.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hid/hid-nvidia-blake.c b/drivers/hid/hid-nvidia-blake.c index 9bbc74501d88..76fea875bbf8 100644 --- a/drivers/hid/hid-nvidia-blake.c +++ b/drivers/hid/hid-nvidia-blake.c @@ -533,12 +533,12 @@ static int nvidia_probe(struct hid_device *hdev, const struct hid_device_id *id) ret = device_create_file(&hdev->dev, &dev_attr_mode); if (ret) hid_warn(hdev, "cannot create sysfs for mode\n"); - return 0; - nvidia_init_ff(hdev, loc); nvidia_find_tp_len(hdev, loc); + return 0; + err_parse: kfree(loc); return ret; |