misc: kxtf9: Return success in resume if no enable necessary.
authorAndrei Warkentin <andreiw@motorola.com>
Mon, 6 Dec 2010 22:12:05 +0000 (16:12 -0600)
committerRebecca Schultz Zavin <rebecca@android.com>
Tue, 7 Dec 2010 00:43:31 +0000 (16:43 -0800)
Resume handler would return -1 if no enabling was necessary.

Change-Id: Ia4d21df8f630386b621181935743bb4d7a0f6380
Signed-off-by: Andrei Warkentin <andreiw@motorola.com>
drivers/misc/kxtf9.c

index 7a4d233fb24c023dfc27044cc6a1b8a050a29337..c9f23094139da432b060ba5cad373e9be3e56628 100755 (executable)
@@ -1209,14 +1209,15 @@ static int __devexit kxtf9_remove(struct i2c_client *client)
 
 static int kxtf9_resume(struct i2c_client *client)
 {
-       int err = -1 ;
+       int err;
        struct kxtf9_data *tf9 = i2c_get_clientdata(client);
-       if(tf9->enabled_b4_suspend != 0) {
-               err = kxtf9_enable(tf9);
-               if(!err) {
-                       err = kxtf9_update_odr(tf9,tf9->pdata->poll_interval);
-               }
-       }
+       if(!tf9->enabled_b4_suspend)
+               return 0;
+
+       err = kxtf9_enable(tf9);
+       if(err)
+               return err;
+       err = kxtf9_update_odr(tf9,tf9->pdata->poll_interval);
        return err;
 }