From: Srinivas Pandruvada Date: Tue, 29 Apr 2014 15:44:00 +0000 (+0100) Subject: iio: ak8975: Fix issue with the name X-Git-Tag: firefly_0821_release~176^2~3465^2~39^2~1015^2~17 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=88cece46acb88c4032d34b8b52796e08a99c34d2;p=firefly-linux-kernel-4.4.55.git iio: ak8975: Fix issue with the name Fixing issue caused by clash of two patches, one adding a name with the acpi enumeration patch. 54ab3e24 Beomho Seo 2014-04-02 @572 indio_dev->name = id->name; d913971e Srinivas Pandruvada 2014-03-19 574 indio_dev->name = name; The name added by commit 54ab3e24 is not required as this is already added by taking care of case where id is NULL. Signed-off-by: Srinivas Pandruvada Reported-by: kbuild test robot Signed-off-by: Jonathan Cameron --- diff --git a/drivers/iio/magnetometer/ak8975.c b/drivers/iio/magnetometer/ak8975.c index f5c1d41bf39f..09ea5c481f4c 100644 --- a/drivers/iio/magnetometer/ak8975.c +++ b/drivers/iio/magnetometer/ak8975.c @@ -569,7 +569,6 @@ static int ak8975_probe(struct i2c_client *client, indio_dev->channels = ak8975_channels; indio_dev->num_channels = ARRAY_SIZE(ak8975_channels); indio_dev->info = &ak8975_info; - indio_dev->name = id->name; indio_dev->modes = INDIO_DIRECT_MODE; indio_dev->name = name; err = iio_device_register(indio_dev);