| Message ID | 2g3mKs1L1RQqM5Y8BIeCZMTq5bZPOQ0HB6NXaXVflWFWn9JN0XfGKAkhrff5y9rGdeFdvMFGTxbHMYYOewESES7Nq-mO_9gca3mKbLtrTYc=@protonmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Mon, Jul 02, 2018 at 08:30:09PM -0400, Donald Shanty III wrote: > Fixed bug where the touchpad driver would not initialize on Lenovo > Ideapad 330 series laptops due to the ACPI ID not being included in the > file. After this patch is made, the touchpad works as expected. > > Signed-off-by: Donald Shanty III <dshanty@protonmail.com> Applied, thank you. > --- > drivers/input/mouse/elan_i2c_core.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/input/mouse/elan_i2c_core.c b/drivers/input/mouse/elan_i2c_core.c > index 1f9cd7d8b7ad..08d49c65ca3d 100644 > --- a/drivers/input/mouse/elan_i2c_core.c > +++ b/drivers/input/mouse/elan_i2c_core.c > @@ -971,7 +971,7 @@ static irqreturn_t elan_isr(int irq, void *dev_id) > * When device is connected to i2c bus, when all IAP page writes > * complete, the driver will receive interrupt and must read > * 0000 to confirm that IAP is finished. > - */ > + */ > if (data->in_fw_update) { > complete(&data->fw_completion); > goto out; > @@ -1346,6 +1346,7 @@ static const struct acpi_device_id elan_acpi_id[] = { > { "ELAN0611", 0 }, > { "ELAN0612", 0 }, > { "ELAN0618", 0 }, > + { "ELAN061D", 0 }, > { "ELAN1000", 0 }, > { } > }; > -- > 2.18.0 >
diff --git a/drivers/input/mouse/elan_i2c_core.c b/drivers/input/mouse/elan_i2c_core.c index 1f9cd7d8b7ad..08d49c65ca3d 100644 --- a/drivers/input/mouse/elan_i2c_core.c +++ b/drivers/input/mouse/elan_i2c_core.c @@ -971,7 +971,7 @@ static irqreturn_t elan_isr(int irq, void *dev_id) * When device is connected to i2c bus, when all IAP page writes * complete, the driver will receive interrupt and must read * 0000 to confirm that IAP is finished. - */ + */ if (data->in_fw_update) { complete(&data->fw_completion); goto out; @@ -1346,6 +1346,7 @@ static const struct acpi_device_id elan_acpi_id[] = { { "ELAN0611", 0 }, { "ELAN0612", 0 }, { "ELAN0618", 0 }, + { "ELAN061D", 0 }, { "ELAN1000", 0 }, { } };
Fixed bug where the touchpad driver would not initialize on Lenovo Ideapad 330 series laptops due to the ACPI ID not being included in the file. After this patch is made, the touchpad works as expected. Signed-off-by: Donald Shanty III <dshanty@protonmail.com> --- drivers/input/mouse/elan_i2c_core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)