Merge by hand (conflicts in sr.c)

[powerpc.git] / drivers / hwmon / adm1026.c

diff --git a/drivers/hwmon/adm1026.c b/drivers/hwmon/adm1026.c
index 3c85fe1..c8a7f47 100644 (file)
--- a/drivers/hwmon/adm1026.c
+++ b/drivers/hwmon/adm1026.c
@@ -325,7 +325,7 @@ int adm1026_attach_adapter(struct i2c_adapter *adapter)
 int adm1026_detach_client(struct i2c_client *client)
 {
        i2c_detach_client(client);
-       kfree(client);
+       kfree(i2c_get_clientdata(client));
        return 0;
 }
 
@@ -393,7 +393,7 @@ void adm1026_init_client(struct i2c_client *client)
 
        value = data->config3;
        if (data->config3 & CFG3_GPIO16_ENABLE) {
-               dev_dbg(&client->dev, "GPIO16 enabled.  THERM"
+               dev_dbg(&client->dev, "GPIO16 enabled.  THERM "
                        "pin disabled.\n");
        } else {
                dev_dbg(&client->dev, "THERM pin enabled.  "
@@ -1691,7 +1691,7 @@ int adm1026_detect(struct i2c_adapter *adapter, int address,
 
        /* Error out and cleanup code */
 exitfree:
-       kfree(new_client);
+       kfree(data);
 exit:
        return err;
 }