diff options
| author | J. Ali Harlow | 2011-05-18 20:18:54 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2011-05-18 23:32:06 +0200 |
| commit | 510b9be374a4b589e7f6182d306b3c8ec9575e05 (patch) | |
| tree | 2af1ac4c6ce8228842ba65c9554bea3f7943ce5a /drivers | |
| parent | comedi vmk80xx: simplify rinsn output calculation (diff) | |
| download | kernel-qcow2-linux-510b9be374a4b589e7f6182d306b3c8ec9575e05.tar.gz kernel-qcow2-linux-510b9be374a4b589e7f6182d306b3c8ec9575e05.tar.xz kernel-qcow2-linux-510b9be374a4b589e7f6182d306b3c8ec9575e05.zip | |
comedi vmk80xx: extend rudimentary_check to check both directions
rudimentary_check() can currently check whether the input or
output direction is currently available (no pending transaction),
but not both at the same time. We need this facility for do_bits().
Signed-off-by: J. Ali Harlow <ali@avrc.city.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/comedi/drivers/vmk80xx.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/staging/comedi/drivers/vmk80xx.c b/drivers/staging/comedi/drivers/vmk80xx.c index c86c8664101b..669ebf85f575 100644 --- a/drivers/staging/comedi/drivers/vmk80xx.c +++ b/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; } |