summaryrefslogtreecommitdiff
path: root/drivers/tty/n_gsm.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-16 10:48:15 +0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-16 10:48:15 +0400
commit4e18585d51434c28269e625e56a06396d70d0ff2 (patch)
tree24b5e8f6d66986d636d96622808d160bad565a52 /drivers/tty/n_gsm.c
parentd73dfc6a4199e0e37b54c647549828eabda67c7c (diff)
downloadlinux-4e18585d51434c28269e625e56a06396d70d0ff2.tar.xz
Revert "n_gsm.c: add tx_lock in gsm_send"
This reverts commit f96f7f7f39af53274d98aa9c29d6fa4d122218a4, at the request of Jin. Cc: xiaojin <jin.xiao@intel.com> Cc: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/n_gsm.c')
-rw-r--r--drivers/tty/n_gsm.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
index d84dcfeadce3..e0f80ce0cf8f 100644
--- a/drivers/tty/n_gsm.c
+++ b/drivers/tty/n_gsm.c
@@ -573,7 +573,6 @@ 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:
@@ -603,9 +602,7 @@ 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);
}