iio: adxl345: move null check for i2c id at start of probe
authorAlexandru Ardelean <alexandru.ardelean@analog.com>
Tue, 7 Aug 2018 14:06:05 +0000 (17:06 +0300)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Sun, 19 Aug 2018 17:32:05 +0000 (18:32 +0100)
Fixes ef89f4b96a2 ("iio: adxl345: Add support for the ADXL375").

This was found via static checker.
After looking into the code a bit, it's unlikely that there will be a NULL
dereference if the `id` object in that specific code path.
However, it's safe to add a NULL (paranoid) check just to make sure and
remove any uncertainties.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
drivers/iio/accel/adxl345_i2c.c

index 785c89d..f22f713 100644 (file)
@@ -27,6 +27,9 @@ static int adxl345_i2c_probe(struct i2c_client *client,
 {
        struct regmap *regmap;
 
+       if (!id)
+               return -ENODEV;
+
        regmap = devm_regmap_init_i2c(client, &adxl345_i2c_regmap_config);
        if (IS_ERR(regmap)) {
                dev_err(&client->dev, "Error initializing i2c regmap: %ld\n",
@@ -35,7 +38,7 @@ static int adxl345_i2c_probe(struct i2c_client *client,
        }
 
        return adxl345_core_probe(&client->dev, regmap, id->driver_data,
-                                 id ? id->name : NULL);
+                                 id->name);
 }
 
 static int adxl345_i2c_remove(struct i2c_client *client)