iio: hmc5843: fix potential NULL pointer dereferences

devm_regmap_init_i2c may fail and return NULL. The fix returns
the error when it fails.

Signed-off-by: Kangjie Lu <kjlu@umn.edu>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/magnetometer/hmc5843_i2c.c b/drivers/iio/magnetometer/hmc5843_i2c.c
index 3de7f4426ac409d534ec4ec32b587e9a82ba53b4..86abba5827a257befbf8612e22eb5a2e693e17c0 100644 (file)
--- a/drivers/iio/magnetometer/hmc5843_i2c.c
+++ b/drivers/iio/magnetometer/hmc5843_i2c.c
@@ -58,8 +58,13 @@ static const struct regmap_config hmc5843_i2c_regmap_config = {
 static int hmc5843_i2c_probe(struct i2c_client *cli,
                             const struct i2c_device_id *id)
 {
+       struct regmap *regmap = devm_regmap_init_i2c(cli,
+                       &hmc5843_i2c_regmap_config);
+       if (IS_ERR(regmap))
+               return PTR_ERR(regmap);
+
        return hmc5843_common_probe(&cli->dev,
-                       devm_regmap_init_i2c(cli, &hmc5843_i2c_regmap_config),
+                       regmap,
                        id->driver_data, id->name);
 }
 

diff --git a/drivers/iio/magnetometer/hmc5843_spi.c b/drivers/iio/magnetometer/hmc5843_spi.c
index 535f03a70d630f7f37b0fda73c3e39da92c28c73..79b2b707f90e702d72c55f3165d42a5f8abe122f 100644 (file)
--- a/drivers/iio/magnetometer/hmc5843_spi.c
+++ b/drivers/iio/magnetometer/hmc5843_spi.c
@@ -58,6 +58,7 @@ static const struct regmap_config hmc5843_spi_regmap_config = {
 static int hmc5843_spi_probe(struct spi_device *spi)
 {
        int ret;
+       struct regmap *regmap;
        const struct spi_device_id *id = spi_get_device_id(spi);
 
        spi->mode = SPI_MODE_3;
@@ -67,8 +68,12 @@ static int hmc5843_spi_probe(struct spi_device *spi)
        if (ret)
                return ret;
 
+       regmap = devm_regmap_init_spi(spi, &hmc5843_spi_regmap_config);
+       if (IS_ERR(regmap))
+               return PTR_ERR(regmap);
+
        return hmc5843_common_probe(&spi->dev,
-                       devm_regmap_init_spi(spi, &hmc5843_spi_regmap_config),
+                       regmap,
                        id->driver_data, id->name);
 }