aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/isdn/gigaset/usb-gigaset.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/isdn/gigaset/usb-gigaset.c')
-rw-r--r--drivers/isdn/gigaset/usb-gigaset.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/isdn/gigaset/usb-gigaset.c b/drivers/isdn/gigaset/usb-gigaset.c
index a1263019df5e..ca4bee173cfb 100644
--- a/drivers/isdn/gigaset/usb-gigaset.c
+++ b/drivers/isdn/gigaset/usb-gigaset.c
@@ -310,7 +310,6 @@ static void gigaset_modem_fill(unsigned long data)
310 struct cardstate *cs = (struct cardstate *) data; 310 struct cardstate *cs = (struct cardstate *) data;
311 struct bc_state *bcs = &cs->bcs[0]; /* only one channel */ 311 struct bc_state *bcs = &cs->bcs[0]; /* only one channel */
312 struct cmdbuf_t *cb; 312 struct cmdbuf_t *cb;
313 unsigned long flags;
314 int again; 313 int again;
315 314
316 gig_dbg(DEBUG_OUTPUT, "modem_fill"); 315 gig_dbg(DEBUG_OUTPUT, "modem_fill");
@@ -323,9 +322,7 @@ static void gigaset_modem_fill(unsigned long data)
323 do { 322 do {
324 again = 0; 323 again = 0;
325 if (!bcs->tx_skb) { /* no skb is being sent */ 324 if (!bcs->tx_skb) { /* no skb is being sent */
326 spin_lock_irqsave(&cs->cmdlock, flags);
327 cb = cs->cmdbuf; 325 cb = cs->cmdbuf;
328 spin_unlock_irqrestore(&cs->cmdlock, flags);
329 if (cb) { /* commands to send? */ 326 if (cb) { /* commands to send? */
330 gig_dbg(DEBUG_OUTPUT, "modem_fill: cb"); 327 gig_dbg(DEBUG_OUTPUT, "modem_fill: cb");
331 if (send_cb(cs, cb) < 0) { 328 if (send_cb(cs, cb) < 0) {
@@ -546,13 +543,9 @@ static int gigaset_write_cmd(struct cardstate *cs, const unsigned char *buf,
546 543
547static int gigaset_write_room(struct cardstate *cs) 544static int gigaset_write_room(struct cardstate *cs)
548{ 545{
549 unsigned long flags;
550 unsigned bytes; 546 unsigned bytes;
551 547
552 spin_lock_irqsave(&cs->cmdlock, flags);
553 bytes = cs->cmdbytes; 548 bytes = cs->cmdbytes;
554 spin_unlock_irqrestore(&cs->cmdlock, flags);
555
556 return bytes < IF_WRITEBUF ? IF_WRITEBUF - bytes : 0; 549 return bytes < IF_WRITEBUF ? IF_WRITEBUF - bytes : 0;
557} 550}
558 551