Commit 0aac6f9a authored by Jiri Kosina's avatar Jiri Kosina
Browse files

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
parents 819d578d 2e1b9e1e

drivers/hid/hid-lg-g15.c

+4 −2
Original line number Diff line number Diff line
@@ -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 */

drivers/hid/hid-rmi.c

+0 −1
Original line number Diff line number Diff line
@@ -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);