From: Lennart Poettering <lennart@poettering.net>
Date: Sun, 28 Oct 2007 16:45:59 +0000 (+0000)
Subject: Merge r1473 from trunk (mixer ioctls on /dev/dsp)
X-Git-Tag: v0.9.11~63^2~1^2~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d8976a21aadf7e998e995c5e5416a8ed3703557e;p=platform%2Fupstream%2Fpulseaudio.git

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
---

diff --git a/src/utils/padsp.c b/src/utils/padsp.c
index 299033e..b48af93 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;