diff options
Diffstat (limited to 'drivers/isdn/gigaset/ser-gigaset.c')
-rw-r--r-- | drivers/isdn/gigaset/ser-gigaset.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/isdn/gigaset/ser-gigaset.c b/drivers/isdn/gigaset/ser-gigaset.c index ea44302e6e7e..f2bb1aeb0c80 100644 --- a/drivers/isdn/gigaset/ser-gigaset.c +++ b/drivers/isdn/gigaset/ser-gigaset.c | |||
@@ -240,7 +240,7 @@ static int gigaset_write_cmd(struct cardstate *cs, const unsigned char *buf, | |||
240 | struct cmdbuf_t *cb; | 240 | struct cmdbuf_t *cb; |
241 | unsigned long flags; | 241 | unsigned long flags; |
242 | 242 | ||
243 | gigaset_dbg_buffer(atomic_read(&cs->mstate) != MS_LOCKED ? | 243 | gigaset_dbg_buffer(cs->mstate != MS_LOCKED ? |
244 | DEBUG_TRANSCMD : DEBUG_LOCKCMD, | 244 | DEBUG_TRANSCMD : DEBUG_LOCKCMD, |
245 | "CMD Transmit", len, buf); | 245 | "CMD Transmit", len, buf); |
246 | 246 | ||
@@ -536,7 +536,7 @@ gigaset_tty_open(struct tty_struct *tty) | |||
536 | * startup system and notify the LL that we are ready to run | 536 | * startup system and notify the LL that we are ready to run |
537 | */ | 537 | */ |
538 | if (startmode == SM_LOCKED) | 538 | if (startmode == SM_LOCKED) |
539 | atomic_set(&cs->mstate, MS_LOCKED); | 539 | cs->mstate = MS_LOCKED; |
540 | if (!gigaset_start(cs)) { | 540 | if (!gigaset_start(cs)) { |
541 | tasklet_kill(&cs->write_tasklet); | 541 | tasklet_kill(&cs->write_tasklet); |
542 | goto error; | 542 | goto error; |
@@ -714,8 +714,8 @@ gigaset_tty_receive(struct tty_struct *tty, const unsigned char *buf, | |||
714 | return; | 714 | return; |
715 | } | 715 | } |
716 | 716 | ||
717 | tail = atomic_read(&inbuf->tail); | 717 | tail = inbuf->tail; |
718 | head = atomic_read(&inbuf->head); | 718 | head = inbuf->head; |
719 | gig_dbg(DEBUG_INTR, "buffer state: %u -> %u, receive %u bytes", | 719 | gig_dbg(DEBUG_INTR, "buffer state: %u -> %u, receive %u bytes", |
720 | head, tail, count); | 720 | head, tail, count); |
721 | 721 | ||
@@ -742,7 +742,7 @@ gigaset_tty_receive(struct tty_struct *tty, const unsigned char *buf, | |||
742 | } | 742 | } |
743 | 743 | ||
744 | gig_dbg(DEBUG_INTR, "setting tail to %u", tail); | 744 | gig_dbg(DEBUG_INTR, "setting tail to %u", tail); |
745 | atomic_set(&inbuf->tail, tail); | 745 | inbuf->tail = tail; |
746 | 746 | ||
747 | /* Everything was received .. Push data into handler */ | 747 | /* Everything was received .. Push data into handler */ |
748 | gig_dbg(DEBUG_INTR, "%s-->BH", __func__); | 748 | gig_dbg(DEBUG_INTR, "%s-->BH", __func__); |