Skip to content

Commit

Permalink
staging:iio:resolver:ad2s90 fix registration of null pointer
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jonathan Cameron authored and Greg Kroah-Hartman committed Oct 5, 2011
1 parent 4a70513 commit 72a86cc
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions drivers/staging/iio/resolver/ad2s90.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@

struct ad2s90_state {
struct mutex lock;
struct iio_dev *idev;
struct spi_device *sdev;
u8 rx[2] ____cacheline_aligned;
};
Expand Down Expand Up @@ -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;

Expand All @@ -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;
}
Expand Down

0 comments on commit 72a86cc

Please sign in to comment.