diff --git a/[refs] b/[refs] index ccbb72d33f2a..a7a26939ad19 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5425e03f97d1e5847372aae0b895d8d1c9bf2741 +refs/heads/master: f96f7f7f39af53274d98aa9c29d6fa4d122218a4 diff --git a/trunk/drivers/tty/n_gsm.c b/trunk/drivers/tty/n_gsm.c index dcc0430a49c8..4572117988f8 100644 --- a/trunk/drivers/tty/n_gsm.c +++ b/trunk/drivers/tty/n_gsm.c @@ -573,6 +573,7 @@ static void gsm_send(struct gsm_mux *gsm, int addr, int cr, int control) int len; u8 cbuf[10]; u8 ibuf[3]; + unsigned long flags; switch (gsm->encoding) { case 0: @@ -602,7 +603,9 @@ static void gsm_send(struct gsm_mux *gsm, int addr, int cr, int control) WARN_ON(1); return; } + spin_lock_irqsave(&gsm->tx_lock, flags); gsm->output(gsm, cbuf, len); + spin_unlock_irqrestore(&gsm->tx_lock, flags); gsm_print_packet("-->", addr, cr, control, NULL, 0); }