diff options
author | Arnd Bergmann <arnd@arndb.de> | 2014-02-26 06:01:53 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-02-26 16:06:13 -0500 |
commit | c728cc88cec52a6bf97679ed4353bc42ff25e6ab (patch) | |
tree | 37d77f03a9d6a9046ad8e850d65a26ea8b23a208 /drivers/isdn/hisax/elsa_ser.c | |
parent | e5b3fa1547283b25d5e68ad2563b7e7dd8cb1209 (diff) |
isdn: hisax/elsa: fix sleep_on race in elsa FSM
The state machine code in the elsa driver uses interruptible_sleep_on
to wait for state changes, which is racy. A closer look at the possible
states reveals that it is always used to wait for getting back into
ARCOFI_NOP, so we can use wait_event_interruptible instead.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Karsten Keil <isdn@linux-pingi.de>
Cc: netdev@vger.kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/isdn/hisax/elsa_ser.c')
-rw-r--r-- | drivers/isdn/hisax/elsa_ser.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/isdn/hisax/elsa_ser.c b/drivers/isdn/hisax/elsa_ser.c index 3f84dd8f1757..a2a358c1dc8e 100644 --- a/drivers/isdn/hisax/elsa_ser.c +++ b/drivers/isdn/hisax/elsa_ser.c | |||
@@ -573,7 +573,8 @@ modem_l2l1(struct PStack *st, int pr, void *arg) | |||
573 | test_and_clear_bit(BC_FLG_ACTIV, &bcs->Flag); | 573 | test_and_clear_bit(BC_FLG_ACTIV, &bcs->Flag); |
574 | bcs->cs->dc.isac.arcofi_bc = st->l1.bc; | 574 | bcs->cs->dc.isac.arcofi_bc = st->l1.bc; |
575 | arcofi_fsm(bcs->cs, ARCOFI_START, &ARCOFI_XOP_0); | 575 | arcofi_fsm(bcs->cs, ARCOFI_START, &ARCOFI_XOP_0); |
576 | interruptible_sleep_on(&bcs->cs->dc.isac.arcofi_wait); | 576 | wait_event_interruptible(bcs->cs->dc.isac.arcofi_wait, |
577 | bcs->cs->dc.isac.arcofi_state == ARCOFI_NOP); | ||
577 | bcs->cs->hw.elsa.MFlag = 1; | 578 | bcs->cs->hw.elsa.MFlag = 1; |
578 | } else { | 579 | } else { |
579 | printk(KERN_WARNING "ElsaSer: unknown pr %x\n", pr); | 580 | printk(KERN_WARNING "ElsaSer: unknown pr %x\n", pr); |