Merge branch 'sched/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip...

[linux-2.6] / drivers / isdn / gigaset / i4l.c

diff --git a/drivers/isdn/gigaset/i4l.c b/drivers/isdn/gigaset/i4l.c
index 7059b84b96a7c0c9a80a2ff0cb447ef84c9722ca..9e089f06a942a0e6aad81695819831fb47f7b2ca 100644 (file)
--- a/drivers/isdn/gigaset/i4l.c
+++ b/drivers/isdn/gigaset/i4l.c
@@ -56,11 +56,6 @@ static int writebuf_from_LL(int driverID, int channel, int ack,
                "Receiving data from LL (id: %d, ch: %d, ack: %d, sz: %d)",
                driverID, channel, ack, len);
 
-       if (!atomic_read(&cs->connected)) {
-               err("%s: disconnected", __func__);
-               return -ENODEV;
-       }
-
        if (!len) {
                if (ack)
                        notice("%s: not ACKing empty packet", __func__);
@@ -114,16 +109,13 @@ 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;
 
        gigaset_debugdrivers();
 
-       //FIXME "remove test for &connected"
-       if ((!cs || !atomic_read(&cs->connected))) {
+       if (!cs) {
                warn("LL tried to access unknown device with nr. %d",
                     cntrl->driver);
                return -ENODEV;
@@ -167,8 +159,7 @@ static int command_from_LL(isdn_ctrl *cntrl)
                *sp = cntrl->parm.setup;
 
                if (!gigaset_add_event(cs, &bcs->at_state, EV_DIAL, sp,
-                                      atomic_read(&bcs->at_state.seq_index),
-                                      NULL)) {
+                                      bcs->at_state.seq_index, NULL)) {
                        //FIXME what should we do?
                        kfree(sp);
                        gigaset_free_channel(bcs);