diff options
| author | Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> | 2014-04-29 11:44:00 -0400 |
|---|---|---|
| committer | Jonathan Cameron <jic23@kernel.org> | 2014-05-03 07:01:13 -0400 |
| commit | 88cece46acb88c4032d34b8b52796e08a99c34d2 (patch) | |
| tree | 7fd1f5df9b1eea6b08627c1be21d5a79c7765d5a | |
| parent | 89a9430f1e65bc5b0eef78587d54306f813cd028 (diff) | |
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 <srinivas.pandruvada@linux.intel.com>
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
| -rw-r--r-- | drivers/iio/magnetometer/ak8975.c | 1 |
1 files changed, 0 insertions, 1 deletions
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, | |||
| 569 | indio_dev->channels = ak8975_channels; | 569 | indio_dev->channels = ak8975_channels; |
| 570 | indio_dev->num_channels = ARRAY_SIZE(ak8975_channels); | 570 | indio_dev->num_channels = ARRAY_SIZE(ak8975_channels); |
| 571 | indio_dev->info = &ak8975_info; | 571 | indio_dev->info = &ak8975_info; |
| 572 | indio_dev->name = id->name; | ||
| 573 | indio_dev->modes = INDIO_DIRECT_MODE; | 572 | indio_dev->modes = INDIO_DIRECT_MODE; |
| 574 | indio_dev->name = name; | 573 | indio_dev->name = name; |
| 575 | err = iio_device_register(indio_dev); | 574 | err = iio_device_register(indio_dev); |