Driver core: Merge 2.6.37-rc2 into driver-core-next

This resolves some build issues that were present in the older -rc1
tree that kept bothering me.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 1 insertions, 2 deletions

diff --git a/drivers/misc/apds9802als.c b/drivers/misc/apds9802als.c
index f9b91ba8900c..644d4cd071cc 100644
--- a/drivers/misc/apds9802als.c
+++ b/drivers/misc/apds9802als.c
@@ -123,7 +123,7 @@ static ssize_t als_sensing_range_store(struct device *dev,
 {
         struct i2c_client *client = to_i2c_client(dev);
         struct als_data *data = i2c_get_clientdata(client);
-        unsigned int ret_val;
+        int ret_val;
         unsigned long val;
 
         if (strict_strtoul(buf, 10, &val))
@@ -251,7 +251,6 @@ static int apds9802als_probe(struct i2c_client *client,
 
         return res;
 als_error1:
-        i2c_set_clientdata(client, NULL);
         kfree(data);
         return res;
 }