diff options
| author | Ingo Molnar <mingo@elte.hu> | 2006-01-16 22:14:00 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-16 23:15:26 -0800 |
| commit | 8f56a31ad616b13414cf764f620f75f45dac26e6 (patch) | |
| tree | 4e53d466c7ef81140ad4f92c78ae7e07f8ceaa87 /drivers/char/esp.c | |
| parent | fd279197b1df6b46076991ca0e1f7faa8f3d8028 (diff) | |
| download | op-kernel-dev-8f56a31ad616b13414cf764f620f75f45dac26e6.zip op-kernel-dev-8f56a31ad616b13414cf764f620f75f45dac26e6.tar.gz | |
[PATCH] drivers/char/esp.c spinlock fix
There's incorrect spinlock usage in espserial_init(): autoconfig() uses
info->lock before it's initialized. The fix is to initialize the spinlock
earlier.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/char/esp.c')
| -rw-r--r-- | drivers/char/esp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/esp.c b/drivers/char/esp.c index dd5dc8f..3f3ac03 100644 --- a/drivers/char/esp.c +++ b/drivers/char/esp.c @@ -2492,6 +2492,7 @@ static int __init espserial_init(void) } memset((void *)info, 0, sizeof(struct esp_struct)); + spin_lock_init(&info->lock); /* rx_trigger, tx_trigger are needed by autoconfig */ info->config.rx_trigger = rx_trigger; info->config.tx_trigger = tx_trigger; @@ -2528,7 +2529,6 @@ static int __init espserial_init(void) init_waitqueue_head(&info->close_wait); init_waitqueue_head(&info->delta_msr_wait); init_waitqueue_head(&info->break_wait); - spin_lock_init(&info->lock); ports = info; printk(KERN_INFO "ttyP%d at 0x%04x (irq = %d) is an ESP ", info->line, info->port, info->irq); |
