diff options
| author | martin gao <marting@nvidia.com> | 2014-07-08 12:29:14 -0700 |
|---|---|---|
| committer | Mandar Padmawar <mpadmawar@nvidia.com> | 2014-07-10 02:05:30 -0700 |
| commit | 8f92707ac43fcf012a55b7a2271a944d86f6e300 (patch) | |
| tree | 65089a293805a1f6b7bb65e1cd17f30970ad6d31 /drivers | |
| parent | ea12ab572c85afc9157802c32bfc50e2c6054d8c (diff) | |
HID: mask HID_CONNECT_FF flag
Remove HID_CONNECT_FF bit from hid_connect.
Device has it's own forced feedback enabled.
Bug 200016744
Change-Id: I98f072c5a61809891264acbe7a498d51acef266f
Signed-off-by: Vinayak Pane <vpane@nvidia.com>
Reviewed-on: http://git-master/r/433807
(cherry picked from commit 9d13c29fd07d8b15b9a5439f4a2057be8704a63d)
Signed-off-by: martin gao <marting@nvidia.com>
Reviewed-on: http://git-master/r/435730
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/hid/hid-nvidia-blake.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/hid/hid-nvidia-blake.c b/drivers/hid/hid-nvidia-blake.c index 76fea875bbf8..c4fe37b9eec1 100644 --- a/drivers/hid/hid-nvidia-blake.c +++ b/drivers/hid/hid-nvidia-blake.c @@ -523,10 +523,13 @@ static int nvidia_probe(struct hid_device *hdev, const struct hid_device_id *id) goto err_parse; } - ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT); + ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT & ~HID_CONNECT_FF); if (ret) goto err_parse; + nvidia_init_ff(hdev, loc); + nvidia_find_tp_len(hdev, loc); + ret = device_create_file(&hdev->dev, &dev_attr_speed); if (ret) hid_warn(hdev, "cannot create sysfs for speed\n"); @@ -534,9 +537,6 @@ static int nvidia_probe(struct hid_device *hdev, const struct hid_device_id *id) if (ret) hid_warn(hdev, "cannot create sysfs for mode\n"); - nvidia_init_ff(hdev, loc); - nvidia_find_tp_len(hdev, loc); - return 0; err_parse: |