summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2007-10-28 16:45:59 +0000
committerLennart Poettering <lennart@poettering.net>2007-10-28 16:45:59 +0000
commitd8976a21aadf7e998e995c5e5416a8ed3703557e (patch)
tree67d58d91f9b0a7f77299c8ac0c56cf80fd1677cd
parentb718d18a2391726758e60862bfb6b6ee1b848daf (diff)
Merge r1473 from trunk (mixer ioctls on /dev/dsp)
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1966 fefdeb5f-60dc-0310-8127-8f9354f1896f
-rw-r--r--src/utils/padsp.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/utils/padsp.c b/src/utils/padsp.c
index 299033e4..b48af93c 100644
--- a/src/utils/padsp.c
+++ b/src/utils/padsp.c
@@ -2292,7 +2292,8 @@ static int dsp_ioctl(fd_info *i, unsigned long request, void*argp, int *_errno)
break;
default:
- debug(DEBUG_LEVEL_NORMAL, __FILE__": unknown ioctl 0x%08lx\n", request);
+ /* Mixer ioctls are valid on /dev/dsp aswell */
+ return mixer_ioctl(i, request, argp, _errno);
inval:
*_errno = EINVAL;