Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

[linux-2.6] / drivers / char / esp.c

diff --git a/drivers/char/esp.c b/drivers/char/esp.c
index c01e26d9ee5ecfff6d51b7de24e8abf536b86d38..f3fe620673440e267172e957f174028933beacbc 100644 (file)
--- a/drivers/char/esp.c
+++ b/drivers/char/esp.c
@@ -2484,6 +2484,7 @@ static int __init espserial_init(void)
                        return 0;
                }
 
+               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;