Commit 72a86ccd authored by Jonathan Cameron's avatar Jonathan Cameron Committed by Greg Kroah-Hartman

staging:iio:resolver:ad2s90 fix registration of null pointer

When the new allocation code was introduced a stray pointer
to iio_dev structure was left in the chip state structure.
This was never set but was then registered with the core.
Signed-off-by: default avatarJonathan Cameron <jic23@cam.ac.uk>
Acked-by: default avatarMichael Hennerich <michael.hennerich@analog.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 4a705130
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
struct ad2s90_state { struct ad2s90_state {
struct mutex lock; struct mutex lock;
struct iio_dev *idev;
struct spi_device *sdev; struct spi_device *sdev;
u8 rx[2] ____cacheline_aligned; u8 rx[2] ____cacheline_aligned;
}; };
...@@ -87,7 +86,7 @@ static int __devinit ad2s90_probe(struct spi_device *spi) ...@@ -87,7 +86,7 @@ static int __devinit ad2s90_probe(struct spi_device *spi)
indio_dev->info = &ad2s90_info; indio_dev->info = &ad2s90_info;
indio_dev->modes = INDIO_DIRECT_MODE; indio_dev->modes = INDIO_DIRECT_MODE;
ret = iio_device_register(st->idev); ret = iio_device_register(indio_dev);
if (ret) if (ret)
goto error_free_dev; goto error_free_dev;
...@@ -99,7 +98,7 @@ static int __devinit ad2s90_probe(struct spi_device *spi) ...@@ -99,7 +98,7 @@ static int __devinit ad2s90_probe(struct spi_device *spi)
return 0; return 0;
error_free_dev: error_free_dev:
iio_free_device(st->idev); iio_free_device(indio_dev);
error_ret: error_ret:
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment