diff options
author | Jonathan Cameron <jic23@cam.ac.uk> | 2011-10-05 10:27:56 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-05 16:47:46 -0400 |
commit | 72a86ccd3a4b60dacddc97095e13f32ee6117314 (patch) | |
tree | 3b2dbded0dc8a3d7ee93d6f0958845af0c1e3749 | |
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>
-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 @@ | |||
23 | 23 | ||
24 | struct ad2s90_state { | 24 | struct ad2s90_state { |
25 | struct mutex lock; | 25 | struct mutex lock; |
26 | struct iio_dev *idev; | ||
27 | struct spi_device *sdev; | 26 | struct spi_device *sdev; |
28 | u8 rx[2] ____cacheline_aligned; | 27 | u8 rx[2] ____cacheline_aligned; |
29 | }; | 28 | }; |
@@ -87,7 +86,7 @@ static int __devinit ad2s90_probe(struct spi_device *spi) | |||
87 | indio_dev->info = &ad2s90_info; | 86 | indio_dev->info = &ad2s90_info; |
88 | indio_dev->modes = INDIO_DIRECT_MODE; | 87 | indio_dev->modes = INDIO_DIRECT_MODE; |
89 | 88 | ||
90 | ret = iio_device_register(st->idev); | 89 | ret = iio_device_register(indio_dev); |
91 | if (ret) | 90 | if (ret) |
92 | goto error_free_dev; | 91 | goto error_free_dev; |
93 | 92 | ||
@@ -99,7 +98,7 @@ static int __devinit ad2s90_probe(struct spi_device *spi) | |||
99 | return 0; | 98 | return 0; |
100 | 99 | ||
101 | error_free_dev: | 100 | error_free_dev: |
102 | iio_free_device(st->idev); | 101 | iio_free_device(indio_dev); |
103 | error_ret: | 102 | error_ret: |
104 | return ret; | 103 | return ret; |
105 | } | 104 | } |