Attachment 938740 Details for Bug 1143812 – Patch backport to resolve i2c-hid sleep issue

Patch backport to resolve i2c-hid sleep issue

linux-3.16.fc20-i2c-hid-suspend-fix.patch (text/plain), 1.48 KB, created by Adam Drew on 2014-09-18 04:24:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adam Drew

Created: 2014-09-18 04:24:17 UTC

Size: 1.48 KB

patch

obsolete

>diff -uNrp kernel-3.16.fc20.orig/linux-3.16.2-200.fc20.x86_64/drivers/hid/i2c-hid/i2c-hid.c kernel-3.16.fc20.new/linux-3.16.2-200.fc20.x86_64/drivers/hid/i2c-hid/i2c-hid.c
>--- linux-3.16.2-200.fc20.x86_64/drivers/hid/i2c-hid/i2c-hid.c	2014-08-03 18:25:02.000000000 -0400
>+++ linux-3.16.2-200.fc20.x86_64/drivers/hid/i2c-hid/i2c-hid.c	2014-09-17 20:24:23.569649816 -0400
>@@ -1054,23 +1054,32 @@ static int i2c_hid_remove(struct i2c_cli
> 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);
> 	if (ret)
> 		return ret;
>@@ -1078,6 +1087,12 @@ static int i2c_hid_resume(struct device
> 	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

Actions: View

Attachments on bug 1143812: 938740 | 938951