Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6

[karo-tx-linux.git] / drivers / staging / iio / ring_generic.h

diff --git a/drivers/staging/iio/ring_generic.h b/drivers/staging/iio/ring_generic.h
index 93b91b28a02f478ef4fc11b026c4cb36d357a15e..09044adf732706806c7b6a808bb9f23d0ba310ec 100644 (file)
--- a/drivers/staging/iio/ring_generic.h
+++ b/drivers/staging/iio/ring_generic.h
@@ -146,8 +146,7 @@ static inline void __iio_init_ring_buffer(struct iio_ring_buffer *ring,
        ring->length = length;
        ring->loopcount = 0;
        ring->shared_ev_pointer.ev_p = 0;
-       ring->shared_ev_pointer.lock =
-               __SPIN_LOCK_UNLOCKED(ring->shared_ev_pointer->loc);
+       spin_lock_init(&ring->shared_ev_pointer.lock);
 }
 
 /**