AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2025-01-20 05:46:12 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'for-5.6/upstream-fixes' into for-linus

Browse Source 
- probe fix for Logitech-G* devices from Hans de Goede
- error handling imrovement in hid-rmi from Christophe JAILLET
This commit is contained in:
Jiri Kosina 2020-04-01 12:25:37 +02:00
commit 0aac6f9aaa
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/hid/hid-lg-g15.c
View File

@ -803,8 +803,10 @@ static int lg_g15_probe(struct hid_device *hdev, const struct hid_device_id *id)
} }
if (ret < 0) { if (ret < 0) {
hid_err(hdev, "Error disabling keyboard emulation for the G-keys\n"); hid_err(hdev, "Error %d disabling keyboard emulation for the G-keys, falling back to generic hid-input driver\n",
goto error_hw_stop; ret);
hid_set_drvdata(hdev, NULL);
return 0;
} }
/* Get initial brightness levels */ /* Get initial brightness levels */

1
drivers/hid/hid-rmi.c
View File

@ -217,7 +217,6 @@ static int rmi_hid_read_block(struct rmi_transport_dev *xport, u16 addr,
ret = rmi_write_report(hdev, data->writeReport, ret = rmi_write_report(hdev, data->writeReport,
data->output_report_size); data->output_report_size);
if (ret != data->output_report_size) { if (ret != data->output_report_size) {
clear_bit(RMI_READ_REQUEST_PENDING, &data->flags);
dev_err(&hdev->dev, dev_err(&hdev->dev,
"failed to write request output report (%d)\n", "failed to write request output report (%d)\n",
ret); ret);