Commit 6b8471e4 authored by Alexandru Ardelean's avatar Alexandru Ardelean Committed by Jonathan Cameron

iio: adxl345: move null check for i2c id at start of probe

Fixes ef89f4b9 ("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: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarAlexandru Ardelean <alexandru.ardelean@analog.com>
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent eb2e1888
...@@ -27,6 +27,9 @@ static int adxl345_i2c_probe(struct i2c_client *client, ...@@ -27,6 +27,9 @@ static int adxl345_i2c_probe(struct i2c_client *client,
{ {
struct regmap *regmap; struct regmap *regmap;
if (!id)
return -ENODEV;
regmap = devm_regmap_init_i2c(client, &adxl345_i2c_regmap_config); regmap = devm_regmap_init_i2c(client, &adxl345_i2c_regmap_config);
if (IS_ERR(regmap)) { if (IS_ERR(regmap)) {
dev_err(&client->dev, "Error initializing i2c regmap: %ld\n", dev_err(&client->dev, "Error initializing i2c regmap: %ld\n",
...@@ -35,7 +38,7 @@ static int adxl345_i2c_probe(struct i2c_client *client, ...@@ -35,7 +38,7 @@ static int adxl345_i2c_probe(struct i2c_client *client,
} }
return adxl345_core_probe(&client->dev, regmap, id->driver_data, 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) static int adxl345_i2c_remove(struct i2c_client *client)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment