]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
iio: imu: inv_mpu6050: Prevent dereferencing NULL
authorSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Fri, 9 Jan 2015 23:13:37 +0000 (15:13 -0800)
committerJonathan Cameron <jic23@kernel.org>
Sat, 10 Jan 2015 22:07:50 +0000 (22:07 +0000)
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>
drivers/iio/imu/inv_mpu6050/inv_mpu_core.c

index b75519deac1a8fed47aa638fe73f069439e47423..eedd3e07d27ca10181e0f4d406ffa8142a093731 100644 (file)
@@ -690,7 +690,11 @@ static int inv_mpu_probe(struct i2c_client *client,
 
        i2c_set_clientdata(client, indio_dev);
        indio_dev->dev.parent = &client->dev;
-       indio_dev->name = id->name;
+       /* id will be NULL when enumerated via ACPI */
+       if (id)
+               indio_dev->name = (char *)id->name;
+       else
+               indio_dev->name = (char *)dev_name(&client->dev);
        indio_dev->channels = inv_mpu_channels;
        indio_dev->num_channels = ARRAY_SIZE(inv_mpu_channels);