HID: rmi: Check that the device is a RMI device in suspend and resume callbacks
Commit 0925636042
("HID: rmi: Disable scanning if the device is not a wake
source") introduced a regression for devices which use hid-rmi to handle
composite USB devices. The suspend or resume callbacks are not checking
that the device is a RMI device before calling rmi_read or rmi_write.
This results in dereferencing uninitialized variables on non RMI devices. This
patch checks that the RMI_DEVICE flag is set before sending RMI commands to the
device.
Reported-by: Rodrigo Gomes <rodrigo.toste.gomes@gmail.com>
Signed-off-by: Andrew Duggan <aduggan@synaptics.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
Родитель
962b7a0e77
Коммит
b786ae8e26
|
@ -594,6 +594,9 @@ static int rmi_suspend(struct hid_device *hdev, pm_message_t message)
|
|||
int ret;
|
||||
u8 buf[RMI_F11_CTRL_REG_COUNT];
|
||||
|
||||
if (!(data->device_flags & RMI_DEVICE))
|
||||
return 0;
|
||||
|
||||
ret = rmi_read_block(hdev, data->f11.control_base_addr, buf,
|
||||
RMI_F11_CTRL_REG_COUNT);
|
||||
if (ret)
|
||||
|
@ -613,6 +616,9 @@ static int rmi_post_reset(struct hid_device *hdev)
|
|||
struct rmi_data *data = hid_get_drvdata(hdev);
|
||||
int ret;
|
||||
|
||||
if (!(data->device_flags & RMI_DEVICE))
|
||||
return 0;
|
||||
|
||||
ret = rmi_reset_attn_mode(hdev);
|
||||
if (ret) {
|
||||
hid_err(hdev, "can not set rmi mode\n");
|
||||
|
@ -640,6 +646,11 @@ static int rmi_post_reset(struct hid_device *hdev)
|
|||
|
||||
static int rmi_post_resume(struct hid_device *hdev)
|
||||
{
|
||||
struct rmi_data *data = hid_get_drvdata(hdev);
|
||||
|
||||
if (!(data->device_flags & RMI_DEVICE))
|
||||
return 0;
|
||||
|
||||
return rmi_reset_attn_mode(hdev);
|
||||
}
|
||||
#endif /* CONFIG_PM */
|
||||
|
|
Загрузка…
Ссылка в новой задаче