Merge tag 'devicetree-fixes-for-4.20-1' of git://git.kernel.org/pub/scm/linux/kernel...

[linux.git] / drivers / iio / accel / adxl345_i2c.c

diff --git a/drivers/iio/accel/adxl345_i2c.c b/drivers/iio/accel/adxl345_i2c.c
index 785c89de91e7b28373addfcdda7c975147027d3d..f22f71315a0cdb912ffef6d5ed70adcfcfb7b71d 100644 (file)
--- a/drivers/iio/accel/adxl345_i2c.c
+++ b/drivers/iio/accel/adxl345_i2c.c
@@ -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)