Commit daebdd7e authored Aug 06, 2014 by Andrew Duggan Committed by Jiri Kosina Aug 14, 2014

HID: rmi: print an error if F11 is not found instead of stopping the device

Currently rmi_probe will return -EIO if the device doesn't report that it has F11.
This would indicate that something happened and the device is in the bootloader.
We can recover the device using a userspace firmware update tool, but it needs
access to the device through the hidraw device file. If the probe returns -EIO
the hidraw device won't be created. So instead of failing the probe, just print
an error message, but leave the device accessible from userspace.

Signed-off-by: Andrew Duggan <aduggan@synaptics.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

parent 5be5db24

drivers/hid/hid-rmi.c

+9 −4

Original line number	Diff line number	Diff line
		@@ -909,10 +909,15 @@ static int rmi_probe(struct hid_device hdev, const struct hid_device_id id)
		return ret;
		}

		if (!test_bit(RMI_STARTED, &data->flags)) {
		hid_hw_stop(hdev);
		return -EIO;
		}
		if (!test_bit(RMI_STARTED, &data->flags))
		/*
		* The device maybe in the bootloader if rmi_input_configured
		* failed to find F11 in the PDT. Print an error, but don't
		* return an error from rmi_probe so that hidraw will be
		* accessible from userspace. That way a userspace tool
		* can be used to reload working firmware on the touchpad.
		*/
		hid_err(hdev, "Device failed to be properly configured\n");

		return 0;
		}

Admin message