Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 140afdd9 authored by Matt Ranostay's avatar Matt Ranostay Committed by Jonathan Cameron
Browse files

iio: imu: mpu6050: fix possible NULL dereferences 



Fix possible null dereferencing of i2c and spi driver data.

Signed-off-by: default avatarMatt Ranostay <matt.ranostay@intel.com>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent 431adc0a

drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c

+2 −1
Original line number Diff line number Diff line
@@ -117,6 +117,7 @@ static int inv_mpu_probe(struct i2c_client *client, 
	struct inv_mpu6050_state *st;

	int result;

	const char *name = id ? id->name : NULL;

	const int chip_type = id ? id->driver_data : 0;

	struct regmap *regmap;



	if (!i2c_check_functionality(client->adapter,
@@ -131,7 +132,7 @@ static int inv_mpu_probe(struct i2c_client *client, 
	}



	result = inv_mpu_core_probe(regmap, client->irq, name,

				    NULL, id->driver_data);

				    NULL, chip_type);

	if (result < 0)

		return result;

drivers/iio/imu/inv_mpu6050/inv_mpu_spi.c

+2 −1
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ static int inv_mpu_probe(struct spi_device *spi) 
	struct regmap *regmap;

	const struct spi_device_id *id = spi_get_device_id(spi);

	const char *name = id ? id->name : NULL;

	const int chip_type = id ? id->driver_data : 0;



	regmap = devm_regmap_init_spi(spi, &inv_mpu_regmap_config);

	if (IS_ERR(regmap)) {
@@ -55,7 +56,7 @@ static int inv_mpu_probe(struct spi_device *spi) 
	}



	return inv_mpu_core_probe(regmap, spi->irq, name,

				  inv_mpu_i2c_disable, id->driver_data);

				  inv_mpu_i2c_disable, chip_type);

}



static int inv_mpu_remove(struct spi_device *spi)