| Message ID | 1422935150-25257-1-git-send-email-jesse.sung@canonical.com |
|---|---|
| State | New |
| Headers | show |
On Tue, Feb 03, 2015 at 11:45:49AM +0800, Wen-chien Jesse Sung wrote: > From: Andrew Duggan <aduggan@synaptics.com> > > BugLink: https://launchpad.net/bugs/1417363 > > Currently, the i2c-hid driver does not call the suspend, resume, and > reset_resume callbacks in the hid_driver struct when those events occur. > This means that HID drivers for i2c-hid devices will not be able to execute > commands which may be needed during suspend or resume. One example is when a > touchpad using the hid-multitouch driver gets reset by i2c-hid coming out of > resume. Since the reset_resume callback never gets called the device is never > put back into the correct input mode. This patch calls the suspend and resume > callbacks and tries to duplicate the functionality of the usb-hid driver. > > Signed-off-by: Andrew Duggan <aduggan@synaptics.com> > Signed-off-by: Vincent Huang <vincent.huang@tw.synaptics.com> > Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> > Signed-off-by: Jiri Kosina <jkosina@suse.cz> > (cherry picked from commit 109571cf3ec78a39477eedd6b11927f52cbcb1e8) > Signed-off-by: Wen-chien Jesse Sung <jesse.sung@canonical.com> > --- > drivers/hid/i2c-hid/i2c-hid.c | 15 ++++++++++++++- > 1 file changed, 14 insertions(+), 1 deletion(-) > > diff --git a/drivers/hid/i2c-hid/i2c-hid.c b/drivers/hid/i2c-hid/i2c-hid.c > index 21aafc8..747d544 100644 > --- a/drivers/hid/i2c-hid/i2c-hid.c > +++ b/drivers/hid/i2c-hid/i2c-hid.c > @@ -1054,21 +1054,29 @@ static int i2c_hid_remove(struct i2c_client *client) > static int i2c_hid_suspend(struct device *dev) > { > struct i2c_client *client = to_i2c_client(dev); > + struct i2c_hid *ihid = i2c_get_clientdata(client); > + struct hid_device *hid = ihid->hid; > + int ret = 0; > > disable_irq(client->irq); > if (device_may_wakeup(&client->dev)) > enable_irq_wake(client->irq); > > + if (hid->driver && hid->driver->suspend) > + ret = hid->driver->suspend(hid, PMSG_SUSPEND); > + > /* Save some power */ > i2c_hid_set_power(client, I2C_HID_PWR_SLEEP); > > - return 0; > + return ret; > } > > static int i2c_hid_resume(struct device *dev) > { > int ret; > struct i2c_client *client = to_i2c_client(dev); > + struct i2c_hid *ihid = i2c_get_clientdata(client); > + struct hid_device *hid = ihid->hid; > > enable_irq(client->irq); > ret = i2c_hid_hwreset(client); > @@ -1078,6 +1086,11 @@ static int i2c_hid_resume(struct device *dev) > if (device_may_wakeup(&client->dev)) > disable_irq_wake(client->irq); > > + if (hid->driver && hid->driver->reset_resume) { > + ret = hid->driver->reset_resume(hid); > + return ret; > + } > + > return 0; > } > #endif > -- > 2.1.0 > > > -- > kernel-team mailing list > kernel-team@lists.ubuntu.com > https://lists.ubuntu.com/mailman/listinfo/kernel-team These are both clean cherry-picks from upstream. The greatest fear with these are always if enough testing has been done. Applied to Utopic master-next
diff --git a/drivers/hid/i2c-hid/i2c-hid.c b/drivers/hid/i2c-hid/i2c-hid.c index 21aafc8..747d544 100644 --- a/drivers/hid/i2c-hid/i2c-hid.c +++ b/drivers/hid/i2c-hid/i2c-hid.c @@ -1054,21 +1054,29 @@ static int i2c_hid_remove(struct i2c_client *client) static int i2c_hid_suspend(struct device *dev) { struct i2c_client *client = to_i2c_client(dev); + struct i2c_hid *ihid = i2c_get_clientdata(client); + struct hid_device *hid = ihid->hid; + int ret = 0; disable_irq(client->irq); if (device_may_wakeup(&client->dev)) enable_irq_wake(client->irq); + if (hid->driver && hid->driver->suspend) + ret = hid->driver->suspend(hid, PMSG_SUSPEND); + /* Save some power */ i2c_hid_set_power(client, I2C_HID_PWR_SLEEP); - return 0; + return ret; } static int i2c_hid_resume(struct device *dev) { int ret; struct i2c_client *client = to_i2c_client(dev); + struct i2c_hid *ihid = i2c_get_clientdata(client); + struct hid_device *hid = ihid->hid; enable_irq(client->irq); ret = i2c_hid_hwreset(client); @@ -1078,6 +1086,11 @@ static int i2c_hid_resume(struct device *dev) if (device_may_wakeup(&client->dev)) disable_irq_wake(client->irq); + if (hid->driver && hid->driver->reset_resume) { + ret = hid->driver->reset_resume(hid); + return ret; + } + return 0; } #endif