From 6dc7ca471bcf7e5f8e75d780b3ab5dbb3bf5a4bf Mon Sep 17 00:00:00 2001 From: "J. Ali Harlow" Date: Wed, 18 May 2011 19:18:54 +0100 Subject: [PATCH] --- yaml --- r: 249755 b: refs/heads/master c: 510b9be374a4b589e7f6182d306b3c8ec9575e05 h: refs/heads/master i: 249753: 28ec8418078f088d5b184c9bb1b244cff7469106 249751: 93da2840497cf0a9da2c47567018520ccdb1ccd6 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/vmk80xx.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a29fbebc6d27..dc96911543cb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9dc99895ef2bd96bad9674e4a0a6228c0690c912 +refs/heads/master: 510b9be374a4b589e7f6182d306b3c8ec9575e05 diff --git a/trunk/drivers/staging/comedi/drivers/vmk80xx.c b/trunk/drivers/staging/comedi/drivers/vmk80xx.c index c86c8664101b..669ebf85f575 100644 --- a/trunk/drivers/staging/comedi/drivers/vmk80xx.c +++ b/trunk/drivers/staging/comedi/drivers/vmk80xx.c @@ -568,7 +568,8 @@ static int rudimentary_check(struct vmk80xx_usb *dev, int dir) if (dir & DIR_IN) { if (test_bit(TRANS_IN_BUSY, &dev->flags)) return -EBUSY; - } else { /* DIR_OUT */ + } + if (dir & DIR_OUT) { if (test_bit(TRANS_OUT_BUSY, &dev->flags)) return -EBUSY; }