Merge tag 'ecryptfs-3.19-rc1-fixes' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / drivers / isdn / gigaset / usb-gigaset.c

diff --git a/drivers/isdn/gigaset/usb-gigaset.c b/drivers/isdn/gigaset/usb-gigaset.c
index a8e652dac54d8aed3691fdb98920328a51a45e49..5f306e2eece5e2a93c1dd86ac8eb29ab59a33e06 100644 (file)
--- a/drivers/isdn/gigaset/usb-gigaset.c
+++ b/drivers/isdn/gigaset/usb-gigaset.c
@@ -293,7 +293,7 @@ static int gigaset_close_bchannel(struct bc_state *bcs)
 }
 
 static int write_modem(struct cardstate *cs);
-static int send_cb(struct cardstate *cs, struct cmdbuf_t *cb);
+static int send_cb(struct cardstate *cs);
 
 
 /* Write tasklet handler: Continue sending current skb, or send command, or
@@ -303,8 +303,6 @@ static void gigaset_modem_fill(unsigned long data)
 {
        struct cardstate *cs = (struct cardstate *) data;
        struct bc_state *bcs = &cs->bcs[0]; /* only one channel */
-       struct cmdbuf_t *cb;
-       int again;
 
        gig_dbg(DEBUG_OUTPUT, "modem_fill");
 
@@ -313,36 +311,32 @@ static void gigaset_modem_fill(unsigned long data)
                return;
        }
 
-       do {
-               again = 0;
-               if (!bcs->tx_skb) { /* no skb is being sent */
-                       cb = cs->cmdbuf;
-                       if (cb) { /* commands to send? */
-                               gig_dbg(DEBUG_OUTPUT, "modem_fill: cb");
-                               if (send_cb(cs, cb) < 0) {
-                                       gig_dbg(DEBUG_OUTPUT,
-                                               "modem_fill: send_cb failed");
-                                       again = 1; /* no callback will be
-                                                     called! */
-                               }
-                       } else { /* skbs to send? */
-                               bcs->tx_skb = skb_dequeue(&bcs->squeue);
-                               if (bcs->tx_skb)
-                                       gig_dbg(DEBUG_INTR,
-                                               "Dequeued skb (Adr: %lx)!",
-                                               (unsigned long) bcs->tx_skb);
-                       }
-               }
-
-               if (bcs->tx_skb) {
-                       gig_dbg(DEBUG_OUTPUT, "modem_fill: tx_skb");
-                       if (write_modem(cs) < 0) {
+again:
+       if (!bcs->tx_skb) {     /* no skb is being sent */
+               if (cs->cmdbuf) {       /* commands to send? */
+                       gig_dbg(DEBUG_OUTPUT, "modem_fill: cb");
+                       if (send_cb(cs) < 0) {
                                gig_dbg(DEBUG_OUTPUT,
-                                       "modem_fill: write_modem failed");
-                               again = 1; /* no callback will be called! */
+                                       "modem_fill: send_cb failed");
+                               goto again; /* no callback will be called! */
                        }
+                       return;
                }
-       } while (again);
+
+               /* skbs to send? */
+               bcs->tx_skb = skb_dequeue(&bcs->squeue);
+               if (!bcs->tx_skb)
+                       return;
+
+               gig_dbg(DEBUG_INTR, "Dequeued skb (Adr: %lx)!",
+                       (unsigned long) bcs->tx_skb);
+       }
+
+       gig_dbg(DEBUG_OUTPUT, "modem_fill: tx_skb");
+       if (write_modem(cs) < 0) {
+               gig_dbg(DEBUG_OUTPUT, "modem_fill: write_modem failed");
+               goto again;     /* no callback will be called! */
+       }
 }
 
 /*
@@ -429,9 +423,9 @@ static void gigaset_write_bulk_callback(struct urb *urb)
        spin_unlock_irqrestore(&cs->lock, flags);
 }
 
-static int send_cb(struct cardstate *cs, struct cmdbuf_t *cb)
+static int send_cb(struct cardstate *cs)
 {
-       struct cmdbuf_t *tcb;
+       struct cmdbuf_t *cb = cs->cmdbuf;
        unsigned long flags;
        int count;
        int status = -ENOENT;
@@ -439,26 +433,27 @@ static int send_cb(struct cardstate *cs, struct cmdbuf_t *cb)
 
        do {
                if (!cb->len) {
-                       tcb = cb;
-
                        spin_lock_irqsave(&cs->cmdlock, flags);
                        cs->cmdbytes -= cs->curlen;
                        gig_dbg(DEBUG_OUTPUT, "send_cb: sent %u bytes, %u left",
                                cs->curlen, cs->cmdbytes);
-                       cs->cmdbuf = cb = cb->next;
-                       if (cb) {
-                               cb->prev = NULL;
-                               cs->curlen = cb->len;
+                       cs->cmdbuf = cb->next;
+                       if (cs->cmdbuf) {
+                               cs->cmdbuf->prev = NULL;
+                               cs->curlen = cs->cmdbuf->len;
                        } else {
                                cs->lastcmdbuf = NULL;
                                cs->curlen = 0;
                        }
                        spin_unlock_irqrestore(&cs->cmdlock, flags);
 
-                       if (tcb->wake_tasklet)
-                               tasklet_schedule(tcb->wake_tasklet);
-                       kfree(tcb);
+                       if (cb->wake_tasklet)
+                               tasklet_schedule(cb->wake_tasklet);
+                       kfree(cb);
+
+                       cb = cs->cmdbuf;
                }
+
                if (cb) {
                        count = min(cb->len, ucs->bulk_out_size);
                        gig_dbg(DEBUG_OUTPUT, "send_cb: send %d bytes", count);