diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2020-04-01 12:25:37 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2020-04-01 12:25:37 +0200 |
| commit | 0aac6f9aaae5fba08963651d2ce49930145e118f (patch) | |
| tree | a4fc8a6806512110d5834afb32f828c198b05466 | |
| parent | 819d578d51d0ce73f06e35d69395ef55cd683a74 (diff) | |
| parent | 2e1b9e1edff7fe19d37f0a5993ac03c5389af809 (diff) | |
Merge branch 'for-5.6/upstream-fixes' into for-linus
- probe fix for Logitech-G* devices from Hans de Goede
- error handling imrovement in hid-rmi from Christophe JAILLET
| -rw-r--r-- | drivers/hid/hid-lg-g15.c | 6 | ||||
| -rw-r--r-- | drivers/hid/hid-rmi.c | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/drivers/hid/hid-lg-g15.c b/drivers/hid/hid-lg-g15.c index 8a9268a5c66a..ad4b5412a9f4 100644 --- a/drivers/hid/hid-lg-g15.c +++ b/drivers/hid/hid-lg-g15.c @@ -803,8 +803,10 @@ static int lg_g15_probe(struct hid_device *hdev, const struct hid_device_id *id) } if (ret < 0) { - hid_err(hdev, "Error disabling keyboard emulation for the G-keys\n"); - goto error_hw_stop; + hid_err(hdev, "Error %d disabling keyboard emulation for the G-keys, falling back to generic hid-input driver\n", + ret); + hid_set_drvdata(hdev, NULL); + return 0; } /* Get initial brightness levels */ diff --git a/drivers/hid/hid-rmi.c b/drivers/hid/hid-rmi.c index 9ce22acdfaca..8cffa84c9650 100644 --- a/drivers/hid/hid-rmi.c +++ b/drivers/hid/hid-rmi.c @@ -217,7 +217,6 @@ static int rmi_hid_read_block(struct rmi_transport_dev *xport, u16 addr, ret = rmi_write_report(hdev, data->writeReport, data->output_report_size); if (ret != data->output_report_size) { - clear_bit(RMI_READ_REQUEST_PENDING, &data->flags); dev_err(&hdev->dev, "failed to write request output report (%d)\n", ret); |