Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

[pandora-kernel.git] / drivers / isdn / gigaset / i4l.c

diff --git a/drivers/isdn/gigaset/i4l.c b/drivers/isdn/gigaset/i4l.c
index 0815dbf..9e089f0 100644 (file)
--- a/drivers/isdn/gigaset/i4l.c
+++ b/drivers/isdn/gigaset/i4l.c
@@ -73,7 +73,7 @@ static int writebuf_from_LL(int driverID, int channel, int ack,
                len, skblen, (unsigned) skb->head[0], (unsigned) skb->head[1]);
 
        /* pass to device-specific module */
-       return cs->ops->send_skb(bcs, skb); //FIXME cs->ops->send_skb() must handle !cs->connected correctly
+       return cs->ops->send_skb(bcs, skb);
 }
 
 void gigaset_skb_sent(struct bc_state *bcs, struct sk_buff *skb)
@@ -109,13 +109,9 @@ EXPORT_SYMBOL_GPL(gigaset_skb_sent);
 static int command_from_LL(isdn_ctrl *cntrl)
 {
        struct cardstate *cs = gigaset_get_cs_by_id(cntrl->driver);
-       //isdn_ctrl response;
-       //unsigned long flags;
        struct bc_state *bcs;
        int retval = 0;
        struct setup_parm *sp;
-       unsigned param;
-       unsigned long flags;
 
        gigaset_debugdrivers();
 
@@ -162,12 +158,8 @@ static int command_from_LL(isdn_ctrl *cntrl)
                }
                *sp = cntrl->parm.setup;
 
-               spin_lock_irqsave(&cs->lock, flags);
-               param = bcs->at_state.seq_index;
-               spin_unlock_irqrestore(&cs->lock, flags);
-
-               if (!gigaset_add_event(cs, &bcs->at_state, EV_DIAL, sp, param,
-                                      NULL)) {
+               if (!gigaset_add_event(cs, &bcs->at_state, EV_DIAL, sp,
+                                      bcs->at_state.seq_index, NULL)) {
                        //FIXME what should we do?
                        kfree(sp);
                        gigaset_free_channel(bcs);