[PATCH] isdn4linux: Siemens Gigaset drivers: make some variables non-atomic

With Hansjoerg Lipp <hjlipp@web.de>

Replace some atomic_t variables in the Gigaset drivers by non-atomic ones,
using spinlocks instead to assure atomicity, as proposed in discussions on the
linux-kernel mailing list.

Signed-off-by: Hansjoerg Lipp <hjlipp@web.de>
Signed-off-by: Tilman Schmidt <tilman@imap.cc>
Cc: Karsten Keil <kkeil@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 6 insertions, 3 deletions

diff --git a/drivers/isdn/gigaset/asyncdata.c b/drivers/isdn/gigaset/asyncdata.c
index ce60f6521b96..ce3cd77094b3 100644
--- a/drivers/isdn/gigaset/asyncdata.c
+++ b/drivers/isdn/gigaset/asyncdata.c
@@ -566,19 +566,22 @@ static struct sk_buff *iraw_encode(struct sk_buff *skb, int head, int tail)
 int gigaset_m10x_send_skb(struct bc_state *bcs, struct sk_buff *skb)
 {
         unsigned len = skb->len;
+        unsigned long flags;
 
         if (bcs->proto2 == ISDN_PROTO_L2_HDLC)
                 skb = HDLC_Encode(skb, HW_HDR_LEN, 0);
         else
                 skb = iraw_encode(skb, HW_HDR_LEN, 0);
         if (!skb) {
-                dev_err(bcs->cs->dev,
-                        "unable to allocate memory for encoding!\n");
+                err("unable to allocate memory for encoding!\n");
                 return -ENOMEM;
         }
 
         skb_queue_tail(&bcs->squeue, skb);
-        tasklet_schedule(&bcs->cs->write_tasklet);
+        spin_lock_irqsave(&bcs->cs->lock, flags);
+        if (bcs->cs->connected)
+                tasklet_schedule(&bcs->cs->write_tasklet);
+        spin_unlock_irqrestore(&bcs->cs->lock, flags);
 
         return len;     /* ok so far */
 }