Merge tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...

[karo-tx-linux.git] / drivers / char / random.c

diff --git a/drivers/char/random.c b/drivers/char/random.c
index 57d4b152267cc419ad0b123cadadaccd256dd96f..32a6c5764950f642d12ae884aa7eb95d9cd1ccc2 100644 (file)
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -445,7 +445,7 @@ static struct entropy_store input_pool = {
        .poolinfo = &poolinfo_table[0],
        .name = "input",
        .limit = 1,
-       .lock = __SPIN_LOCK_UNLOCKED(&input_pool.lock),
+       .lock = __SPIN_LOCK_UNLOCKED(input_pool.lock),
        .pool = input_pool_data
 };
 
@@ -454,7 +454,7 @@ static struct entropy_store blocking_pool = {
        .name = "blocking",
        .limit = 1,
        .pull = &input_pool,
-       .lock = __SPIN_LOCK_UNLOCKED(&blocking_pool.lock),
+       .lock = __SPIN_LOCK_UNLOCKED(blocking_pool.lock),
        .pool = blocking_pool_data
 };
 
@@ -462,7 +462,7 @@ static struct entropy_store nonblocking_pool = {
        .poolinfo = &poolinfo_table[1],
        .name = "nonblocking",
        .pull = &input_pool,
-       .lock = __SPIN_LOCK_UNLOCKED(&nonblocking_pool.lock),
+       .lock = __SPIN_LOCK_UNLOCKED(nonblocking_pool.lock),
        .pool = nonblocking_pool_data
 };