diff options
author | Jonathan Cameron <jic23@cam.ac.uk> | 2011-07-13 07:52:00 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-07-18 16:23:57 -0400 |
commit | 05a93489bc569d549e55cf7392a8b2bf50d9d095 (patch) | |
tree | ecbb9945909122d130521ab825f8d35aa0e451e4 | |
parent | 8016934cbd0fdf694deee2510650d1f66304f7c3 (diff) |
staging:iio:kfifo_buf fix double initialization of the ring device structure.
Looks like this moved into the core at somepoint and kfifo buf got left
behind.
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/staging/iio/kfifo_buf.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/staging/iio/kfifo_buf.c b/drivers/staging/iio/kfifo_buf.c index cc14b96d814c..6002368fdcfa 100644 --- a/drivers/staging/iio/kfifo_buf.c +++ b/drivers/staging/iio/kfifo_buf.c | |||
@@ -110,9 +110,7 @@ struct iio_ring_buffer *iio_kfifo_allocate(struct iio_dev *indio_dev) | |||
110 | iio_ring_buffer_init(&kf->ring, indio_dev); | 110 | iio_ring_buffer_init(&kf->ring, indio_dev); |
111 | __iio_init_kfifo(kf); | 111 | __iio_init_kfifo(kf); |
112 | kf->ring.dev.type = &iio_kfifo_type; | 112 | kf->ring.dev.type = &iio_kfifo_type; |
113 | device_initialize(&kf->ring.dev); | ||
114 | kf->ring.dev.parent = &indio_dev->dev; | 113 | kf->ring.dev.parent = &indio_dev->dev; |
115 | kf->ring.dev.bus = &iio_bus_type; | ||
116 | dev_set_drvdata(&kf->ring.dev, (void *)&(kf->ring)); | 114 | dev_set_drvdata(&kf->ring.dev, (void *)&(kf->ring)); |
117 | 115 | ||
118 | return &kf->ring; | 116 | return &kf->ring; |