summaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorJonathan Cameron2011-07-13 13:52:00 +0200
committerGreg Kroah-Hartman2011-07-18 22:23:57 +0200
commit05a93489bc569d549e55cf7392a8b2bf50d9d095 (patch)
treeecbb9945909122d130521ab825f8d35aa0e451e4 /drivers/staging
parentstaging:iio:accel:lis3l02dq: fix incorrect pointer passed to spi_set_drvdata. (diff)
downloadkernel-qcow2-linux-05a93489bc569d549e55cf7392a8b2bf50d9d095.tar.gz
kernel-qcow2-linux-05a93489bc569d549e55cf7392a8b2bf50d9d095.tar.xz
kernel-qcow2-linux-05a93489bc569d549e55cf7392a8b2bf50d9d095.zip
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>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/iio/kfifo_buf.c2
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)
iio_ring_buffer_init(&kf->ring, indio_dev);
__iio_init_kfifo(kf);
kf->ring.dev.type = &iio_kfifo_type;
- device_initialize(&kf->ring.dev);
kf->ring.dev.parent = &indio_dev->dev;
- kf->ring.dev.bus = &iio_bus_type;
dev_set_drvdata(&kf->ring.dev, (void *)&(kf->ring));
return &kf->ring;