[pulseaudio-commits] src/modules

[Tanu Kaskinen]

 src/modules/oss/module-oss.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2737985f27fd54e12fc7eea9e922e4b3581b05fd
Author: Tanu Kaskinen <tanu.kaskinen at linux.intel.com>
Date:   Thu Apr 30 13:21:02 2015 +0300

    oss: Use the correct fd when interacting with the mixer
    
    Adapted from a FreeBSD patch:
    http://svnweb.freebsd.org/ports/head/audio/pulseaudio/files/patch-src_modules_oss_module-oss.c?revision=372768&view=markup

diff --git a/src/modules/oss/module-oss.c b/src/modules/oss/module-oss.c
index 1a2f0b1..8537dd8 100644
--- a/src/modules/oss/module-oss.c
+++ b/src/modules/oss/module-oss.c
@@ -1426,7 +1426,7 @@ int pa__init(pa_module*m) {
     if ((u->mixer_fd = pa_oss_open_mixer_for_device(u->device_name)) >= 0) {
         bool do_close = true;
 
-        if (ioctl(fd, SOUND_MIXER_READ_DEVMASK, &u->mixer_devmask) < 0)
+        if (ioctl(u->mixer_fd, SOUND_MIXER_READ_DEVMASK, &u->mixer_devmask) < 0)
             pa_log_warn("SOUND_MIXER_READ_DEVMASK failed: %s", pa_cstrerror(errno));
         else {
             if (u->sink && (u->mixer_devmask & (SOUND_MASK_VOLUME|SOUND_MASK_PCM))) {