summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorFederico G. Schwindt <fgsch@cvs.openbsd.org>2006-01-01 22:55:40 +0000
committerFederico G. Schwindt <fgsch@cvs.openbsd.org>2006-01-01 22:55:40 +0000
commitcaf83edbe5c0e78f061f584632a48bebf5ed3230 (patch)
treef8e68f803b8cdf47f55541f456a7ee83f3d89e03 /sys
parentf6ec090ff820e9342d761bd0f70616ddc668c59f (diff)
correct a typo and reorder check.
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/usb/uaudio.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/usb/uaudio.c b/sys/dev/usb/uaudio.c
index 45e815f148b..57cd8dc3d8b 100644
--- a/sys/dev/usb/uaudio.c
+++ b/sys/dev/usb/uaudio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uaudio.c,v 1.25 2006/01/01 22:49:25 fgsch Exp $ */
+/* $OpenBSD: uaudio.c,v 1.26 2006/01/01 22:55:39 fgsch Exp $ */
/* $NetBSD: uaudio.c,v 1.67 2003/05/03 18:11:41 wiz Exp $ */
/*
@@ -1486,7 +1486,7 @@ uaudio_open(void *addr, int flags)
if ((flags & FWRITE) && !(sc->sc_mode & AUMODE_PLAY))
return (EACCES);
- if ((flags & FREAD) && !(sc->sc_mode | AUMODE_RECORD))
+ if ((flags & FREAD) && !(sc->sc_mode & AUMODE_RECORD))
return (EACCES);
return (0);
@@ -2388,8 +2388,8 @@ uaudio_set_params(void *addr, int setmode, int usemode,
if (sc->sc_dying)
return (EIO);
- if (((usemode & AUMODE_RECORD) && sc->sc_recchan.pipe != NULL) ||
- ((usemode & AUMODE_PLAY) && sc->sc_playchan.pipe != NULL))
+ if (((usemode & AUMODE_PLAY) && sc->sc_playchan.pipe != NULL) ||
+ ((usemode & AUMODE_RECORD) && sc->sc_recchan.pipe != NULL))
return (EBUSY);
if ((usemode & AUMODE_PLAY) && sc->sc_playchan.altidx != -1)