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

Commit 88cece46 authored by Srinivas Pandruvada's avatar Srinivas Pandruvada Committed by Jonathan Cameron
Browse files

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: default avatarSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Reported-by: default avatarkbuild test robot <fengguang.wu@intel.com>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent 89a9430f

drivers/iio/magnetometer/ak8975.c

+0 −1
Original line number Diff line number Diff line
@@ -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);