From 0931544a60171481072b27d7893f0291cd9da1bf Mon Sep 17 00:00:00 2001
From: Daniel Mack <daniel@caiaq.de>
Date: Wed, 6 May 2009 16:03:00 -0700
Subject: [PATCH] --- yaml --- r: 144653 b: refs/heads/master c:
 74614f8d9d4141a3752fc1c38706859b63f4842b h: refs/heads/master i:   144651:
 958f0ca881d80a8cf9e7b2d702f13fcda50f5d50 v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/misc/isl29003.c | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index cde0fe19359b..203ac90e8f46 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 57226e7898076f864d6ce41ddeff4bbc772b950c
+refs/heads/master: 74614f8d9d4141a3752fc1c38706859b63f4842b
diff --git a/trunk/drivers/misc/isl29003.c b/trunk/drivers/misc/isl29003.c
index 2e2a5923d4c2..a71e245801ee 100644
--- a/trunk/drivers/misc/isl29003.c
+++ b/trunk/drivers/misc/isl29003.c
@@ -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