Merge branch 'drm-ttm-unmappable' into drm-core-next

[pandora-kernel.git] / drivers / staging / iio / ring_sw.c

diff --git a/drivers/staging/iio/ring_sw.c b/drivers/staging/iio/ring_sw.c
index 359ff92..b104c3d 100644 (file)
--- a/drivers/staging/iio/ring_sw.c
+++ b/drivers/staging/iio/ring_sw.c
@@ -7,8 +7,8 @@
  * the Free Software Foundation.
  */
 
+#include <linux/slab.h>
 #include <linux/kernel.h>
-#include <linux/device.h>
 #include <linux/module.h>
 #include <linux/device.h>
 #include <linux/workqueue.h>
@@ -21,7 +21,7 @@ static inline int __iio_init_sw_ring_buffer(struct iio_sw_ring_buffer *ring,
                return -EINVAL;
 
        __iio_init_ring_buffer(&ring->buf, bytes_per_datum, length);
-       ring->use_lock = __SPIN_LOCK_UNLOCKED((ring)->use_lock);
+       spin_lock_init(&ring->use_lock);
        ring->data = kmalloc(length*ring->buf.bpd, GFP_KERNEL);
        ring->read_p = 0;
        ring->write_p = 0;