Skip to contentSkip to conversation

isl29003: fix resume functionality

PATCH New Daniel Mack 1 participant 1 message May 5, 2009 Char and misc drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 isl29003: fix resume functionality

The isl29003 does not interpret the return value of i2c_smbus_write_byte_data() correctly and hence causes an error on system resume.

Also introduce power_state_before_suspend and restore the chip's power state upon wakeup.

---
 drivers/misc/isl29003.c |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)
drivers/misc/isl29003.c +7 -2
index 2e2a592..a71e245 100644
@@ -64,6 +64,7 @@ struct isl29003_data {
 	struct i2c_client *client;
 	struct mutex lock;
 	u8 reg_cache[ISL29003_NUM_CACHABLE_REGS];
+	u8 power_state_before_suspend;
 };
 
 static int gain_range[] = {
@@ -411,6 +412,9 @@ static int __devexit isl29003_remove(struct i2c_client *client)
 #ifdef CONFIG_PM
 static int isl29003_suspend(struct i2c_client *client, pm_message_t mesg)
 {
+	struct isl29003_data *data = i2c_get_clientdata(client);
+
+	data->power_state_before_suspend = isl29003_get_power_state(client);
 	return isl29003_set_power_state(client, 0);
 }
 
@@ -421,10 +425,11 @@ static int isl29003_resume(struct i2c_client *client)
 
 	/* restore registers from cache */
 	for (i = 0; i < ARRAY_SIZE(data->reg_cache); i++)
-		if (!i2c_smbus_write_byte_data(client, i, data->reg_cache[i]))
+		if (i2c_smbus_write_byte_data(client, i, data->reg_cache[i]))
 			return -EIO;
 
-	return 0;
+	return isl29003_set_power_state(client,
+		data->power_state_before_suspend);
 }
 
 #else
Signature · 1 line
1.6.2.1