summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2008-06-26 10:19:53 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2008-06-26 10:19:53 +1000
commit4ea78a70bc8b479ea022356b032bbfba9cd7334e (patch)
tree9705df69c395ea3615c12dadcaf0cea4b77d0a65
parentd180580e729c1e8eb719fa913031c2cd35872500 (diff)
misc:down_nowait-drivers_net_irda_sir_dev
down_trylock -> down_try in drivers/net/irda/sir_dev.c Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
-rw-r--r--drivers/net/irda/sir_dev.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/irda/sir_dev.c b/drivers/net/irda/sir_dev.c
index 6078e03de9a8..894aade319b6 100644
--- a/drivers/net/irda/sir_dev.c
+++ b/drivers/net/irda/sir_dev.c
@@ -286,7 +286,7 @@ int sirdev_schedule_request(struct sir_dev *dev, int initial_state, unsigned par
IRDA_DEBUG(2, "%s - state=0x%04x / param=%u\n", __FUNCTION__, initial_state, param);
- if (down_trylock(&fsm->sem)) {
+ if (!down_try(&fsm->sem)) {
if (in_interrupt() || in_atomic() || irqs_disabled()) {
IRDA_DEBUG(1, "%s(), state machine busy!\n", __FUNCTION__);
return -EWOULDBLOCK;