From f77472e6dc12b2f23d712c959b58ae731997580e Mon Sep 17 00:00:00 2001 From: Ruslan Ermilov Date: Fri, 29 Sep 2006 09:10:54 +0000 Subject: [PATCH] The SNDCTL_DSP_NONBLOCK ioctl doesn't take an argument, from what I can tell by browsing the Internet (Linux, OSS, etc.). --- sys/dev/sound/pcm/dsp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index 2eba2c959e6..54231b26437 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -696,11 +696,11 @@ dsp_ioctl(struct cdev *i_dev, u_long cmd, caddr_t arg, int mode, struct thread * DEB( printf("FIOASYNC\n") ; ) break; - case SNDCTL_DSP_NONBLOCK: + case SNDCTL_DSP_NONBLOCK: /* set non-blocking i/o */ case FIONBIO: /* set/clear non-blocking i/o */ if (rdch) { CHN_LOCK(rdch); - if (*arg_i) + if (cmd == SNDCTL_DSP_NONBLOCK || *arg_i) rdch->flags |= CHN_F_NBIO; else rdch->flags &= ~CHN_F_NBIO; @@ -708,7 +708,7 @@ dsp_ioctl(struct cdev *i_dev, u_long cmd, caddr_t arg, int mode, struct thread * } if (wrch) { CHN_LOCK(wrch); - if (*arg_i) + if (cmd == SNDCTL_DSP_NONBLOCK || *arg_i) wrch->flags |= CHN_F_NBIO; else wrch->flags &= ~CHN_F_NBIO;