Commit ac203cdb authored by Sandeep C S's avatar Sandeep C S Committed by Jiri Kosina

HID: samsung: Broaden device compatibility in samsung driver

The USB validation check has been moved wherever its required.

Earlier Samsung driver only handles USB HID devices and returns an error if it
encounters a Bluetooth type of HID device.  This changes improves driver
compatibility and extends its support for a wide range of devices.
Signed-off-by: default avatarSandeep C S <sandeep.cs@samsung.com>
Signed-off-by: default avatarJunwan Cho <junwan.cho@samsung.com>
Signed-off-by: default avatarJitender Sajwan <jitender.s21@samsung.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.com>
parent fef018d8
...@@ -128,7 +128,7 @@ static int samsung_kbd_mouse_input_mapping(struct hid_device *hdev, ...@@ -128,7 +128,7 @@ static int samsung_kbd_mouse_input_mapping(struct hid_device *hdev,
static __u8 *samsung_report_fixup(struct hid_device *hdev, __u8 *rdesc, static __u8 *samsung_report_fixup(struct hid_device *hdev, __u8 *rdesc,
unsigned int *rsize) unsigned int *rsize)
{ {
if (USB_DEVICE_ID_SAMSUNG_IR_REMOTE == hdev->product) if (USB_DEVICE_ID_SAMSUNG_IR_REMOTE == hdev->product && hid_is_usb(hdev))
rdesc = samsung_irda_report_fixup(hdev, rdesc, rsize); rdesc = samsung_irda_report_fixup(hdev, rdesc, rsize);
return rdesc; return rdesc;
} }
...@@ -139,7 +139,7 @@ static int samsung_input_mapping(struct hid_device *hdev, struct hid_input *hi, ...@@ -139,7 +139,7 @@ static int samsung_input_mapping(struct hid_device *hdev, struct hid_input *hi,
{ {
int ret = 0; int ret = 0;
if (USB_DEVICE_ID_SAMSUNG_WIRELESS_KBD_MOUSE == hdev->product) if (USB_DEVICE_ID_SAMSUNG_WIRELESS_KBD_MOUSE == hdev->product && hid_is_usb(hdev))
ret = samsung_kbd_mouse_input_mapping(hdev, ret = samsung_kbd_mouse_input_mapping(hdev,
hi, field, usage, bit, max); hi, field, usage, bit, max);
...@@ -152,9 +152,6 @@ static int samsung_probe(struct hid_device *hdev, ...@@ -152,9 +152,6 @@ static int samsung_probe(struct hid_device *hdev,
int ret; int ret;
unsigned int cmask = HID_CONNECT_DEFAULT; unsigned int cmask = HID_CONNECT_DEFAULT;
if (!hid_is_usb(hdev))
return -EINVAL;
ret = hid_parse(hdev); ret = hid_parse(hdev);
if (ret) { if (ret) {
hid_err(hdev, "parse failed\n"); hid_err(hdev, "parse failed\n");
...@@ -162,6 +159,10 @@ static int samsung_probe(struct hid_device *hdev, ...@@ -162,6 +159,10 @@ static int samsung_probe(struct hid_device *hdev,
} }
if (USB_DEVICE_ID_SAMSUNG_IR_REMOTE == hdev->product) { if (USB_DEVICE_ID_SAMSUNG_IR_REMOTE == hdev->product) {
if (!hid_is_usb(hdev)) {
ret = -EINVAL;
goto err_free;
}
if (hdev->rsize == 184) { if (hdev->rsize == 184) {
/* disable hidinput, force hiddev */ /* disable hidinput, force hiddev */
cmask = (cmask & ~HID_CONNECT_HIDINPUT) | cmask = (cmask & ~HID_CONNECT_HIDINPUT) |
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment