diff options
author | Jonathan Cameron <jic23@cam.ac.uk> | 2011-10-05 15:27:56 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-05 13:47:46 -0700 |
commit | 72a86ccd3a4b60dacddc97095e13f32ee6117314 (patch) | |
tree | 3b2dbded0dc8a3d7ee93d6f0958845af0c1e3749 /drivers | |
parent | 4a70513074091e814fd5444c75f572691b7ba588 (diff) |
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: Jonathan Cameron <jic23@cam.ac.uk>
Acked-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/staging/iio/resolver/ad2s90.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/staging/iio/resolver/ad2s90.c b/drivers/staging/iio/resolver/ad2s90.c index 3739bd24951c..161442ee7d32 100644 --- a/drivers/staging/iio/resolver/ad2s90.c +++ b/drivers/staging/iio/resolver/ad2s90.c @@ -23,7 +23,6 @@ struct ad2s90_state { struct mutex lock; - struct iio_dev *idev; struct spi_device *sdev; u8 rx[2] ____cacheline_aligned; }; @@ -87,7 +86,7 @@ static int __devinit ad2s90_probe(struct spi_device *spi) indio_dev->info = &ad2s90_info; indio_dev->modes = INDIO_DIRECT_MODE; - ret = iio_device_register(st->idev); + ret = iio_device_register(indio_dev); if (ret) goto error_free_dev; @@ -99,7 +98,7 @@ static int __devinit ad2s90_probe(struct spi_device *spi) return 0; error_free_dev: - iio_free_device(st->idev); + iio_free_device(indio_dev); error_ret: return ret; } |