diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-07-17 21:25:03 +0200 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2012-03-24 09:29:02 -0500 |
| commit | 432f8af54e1eb8a95b8306cd0e9796c903261db4 (patch) | |
| tree | bd2d0bcc72aef52c8f1d8c09c0c74fea93d5faa6 /drivers | |
| parent | 62c4ae80f01a91a652432b08040ddd80ec309990 (diff) | |
locking-various-init-fixes.patch
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/char/random.c | 6 | ||||
| -rw-r--r-- | drivers/usb/gadget/ci13xxx_udc.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/char/random.c b/drivers/char/random.c index 786a856d59ba..026bdbb46f8a 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c @@ -433,7 +433,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 }; @@ -442,7 +442,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 }; @@ -450,7 +450,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 }; diff --git a/drivers/usb/gadget/ci13xxx_udc.c b/drivers/usb/gadget/ci13xxx_udc.c index 9a0c3979ff43..f526873313e5 100644 --- a/drivers/usb/gadget/ci13xxx_udc.c +++ b/drivers/usb/gadget/ci13xxx_udc.c @@ -819,7 +819,7 @@ static struct { } dbg_data = { .idx = 0, .tty = 0, - .lck = __RW_LOCK_UNLOCKED(lck) + .lck = __RW_LOCK_UNLOCKED(dbg_data.lck) }; /** |