hwmon: (tmp401) Bail out from tmp401_probe() in case of write errors

[cascardo/linux.git] / drivers / hwmon / tmp401.c

diff --git a/drivers/hwmon/tmp401.c b/drivers/hwmon/tmp401.c
index 7fa6e7d..f2182ee 100644 (file)
--- a/drivers/hwmon/tmp401.c
+++ b/drivers/hwmon/tmp401.c
@@ -46,7 +46,7 @@
 /* Addresses to scan */
 static const unsigned short normal_i2c[] = { 0x4c, 0x4d, 0x4e, I2C_CLIENT_END };
 
-enum chips { tmp401, tmp411, tmp431, tmp432 };
+enum chips { tmp401, tmp411, tmp431, tmp432, tmp435 };
 
 /*
  * The TMP401 registers, note some registers have different addresses for
@@ -136,6 +136,7 @@ static const u8 TMP432_STATUS_REG[] = {
 #define TMP411C_DEVICE_ID                      0x10
 #define TMP431_DEVICE_ID                       0x31
 #define TMP432_DEVICE_ID                       0x32
+#define TMP435_DEVICE_ID                       0x35
 
 /*
  * Driver data (common to all clients)
@@ -146,6 +147,7 @@ static const struct i2c_device_id tmp401_id[] = {
        { "tmp411", tmp411 },
        { "tmp431", tmp431 },
        { "tmp432", tmp432 },
+       { "tmp435", tmp435 },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, tmp401_id);
@@ -613,10 +615,10 @@ static const struct attribute_group tmp432_group = {
  * Begin non sysfs callback code (aka Real code)
  */
 
-static void tmp401_init_client(struct tmp401_data *data,
-                              struct i2c_client *client)
+static int tmp401_init_client(struct tmp401_data *data,
+                             struct i2c_client *client)
 {
-       int config, config_orig;
+       int config, config_orig, status = 0;
 
        /* Set the conversion rate to 2 Hz */
        i2c_smbus_write_byte_data(client, TMP401_CONVERSION_RATE_WRITE, 5);
@@ -624,16 +626,18 @@ static void tmp401_init_client(struct tmp401_data *data,
 
        /* Start conversions (disable shutdown if necessary) */
        config = i2c_smbus_read_byte_data(client, TMP401_CONFIG_READ);
-       if (config < 0) {
-               dev_warn(&client->dev, "Initialization failed!\n");
-               return;
-       }
+       if (config < 0)
+               return config;
 
        config_orig = config;
        config &= ~TMP401_CONFIG_SHUTDOWN;
 
        if (config != config_orig)
-               i2c_smbus_write_byte_data(client, TMP401_CONFIG_WRITE, config);
+               status = i2c_smbus_write_byte_data(client,
+                                                  TMP401_CONFIG_WRITE,
+                                                  config);
+
+       return status;
 }
 
 static int tmp401_detect(struct i2c_client *client,
@@ -684,6 +688,11 @@ static int tmp401_detect(struct i2c_client *client,
                        return -ENODEV;
                kind = tmp432;
                break;
+       case TMP435_DEVICE_ID:
+               if (client->addr != 0x4c)
+                       return -ENODEV;
+               kind = tmp435;
+               break;
        default:
                return -ENODEV;
        }
@@ -705,11 +714,13 @@ static int tmp401_detect(struct i2c_client *client,
 static int tmp401_probe(struct i2c_client *client,
                        const struct i2c_device_id *id)
 {
-       const char *names[] = { "TMP401", "TMP411", "TMP431", "TMP432" };
+       static const char * const names[] = {
+               "TMP401", "TMP411", "TMP431", "TMP432", "TMP435"
+       };
        struct device *dev = &client->dev;
        struct device *hwmon_dev;
        struct tmp401_data *data;
-       int groups = 0;
+       int groups = 0, status;
 
        data = devm_kzalloc(dev, sizeof(struct tmp401_data), GFP_KERNEL);
        if (!data)
@@ -720,7 +731,9 @@ static int tmp401_probe(struct i2c_client *client,
        data->kind = id->driver_data;
 
        /* Initialize the TMP401 chip */
-       tmp401_init_client(data, client);
+       status = tmp401_init_client(data, client);
+       if (status < 0)
+               return status;
 
        /* Register sysfs hooks */
        data->groups[groups++] = &tmp401_group;