aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/iio
diff options
context:
space:
mode:
authorSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>2015-01-09 18:13:37 -0500
committerJonathan Cameron <jic23@kernel.org>2015-01-10 17:07:50 -0500
commit4f33fbae555000bf73aaacbc4f5b24668afc8c7a (patch)
treed30a77c6c0b9ccb0644d01f0900c9f1e5d971173 /drivers/iio
parentf2229ab8611e6e79992b6357db3fb4faf70e74a9 (diff)
iio: imu: inv_mpu6050: Prevent dereferencing NULL
When id is null, with ACPI enumeration, don't dereference it. Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Diffstat (limited to 'drivers/iio')
-rw-r--r--drivers/iio/imu/inv_mpu6050/inv_mpu_core.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
index b75519deac1a..eedd3e07d27c 100644
--- a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
+++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
@@ -690,7 +690,11 @@ static int inv_mpu_probe(struct i2c_client *client,
690 690
691 i2c_set_clientdata(client, indio_dev); 691 i2c_set_clientdata(client, indio_dev);
692 indio_dev->dev.parent = &client->dev; 692 indio_dev->dev.parent = &client->dev;
693 indio_dev->name = id->name; 693 /* id will be NULL when enumerated via ACPI */
694 if (id)
695 indio_dev->name = (char *)id->name;
696 else
697 indio_dev->name = (char *)dev_name(&client->dev);
694 indio_dev->channels = inv_mpu_channels; 698 indio_dev->channels = inv_mpu_channels;
695 indio_dev->num_channels = ARRAY_SIZE(inv_mpu_channels); 699 indio_dev->num_channels = ARRAY_SIZE(inv_mpu_channels);
696 700