summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--sys/sunaudio/gstsunaudiomixerctrl.c3
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 5af8d98e..0f680fce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2008-12-07 Sebastian Dröge <sebastian.droege@collabora.co.uk>
+ Patch by: Brian Cameron <brian.cameron at sun dot com>
+
+ * sys/sunaudio/gstsunaudiomixerctrl.c:
+ (gst_sunaudiomixer_ctrl_open):
+ Set the mixer fd before calling ioctl() on it. Fixes bug #563414.
+
+2008-12-07 Sebastian Dröge <sebastian.droege@collabora.co.uk>
+
Patch by: Alexandre Rostovtsev <tetromino at gmail dot com>
* configure.ac:
diff --git a/sys/sunaudio/gstsunaudiomixerctrl.c b/sys/sunaudio/gstsunaudiomixerctrl.c
index 15fe1147..58978202 100644
--- a/sys/sunaudio/gstsunaudiomixerctrl.c
+++ b/sys/sunaudio/gstsunaudiomixerctrl.c
@@ -62,10 +62,11 @@ gst_sunaudiomixer_ctrl_open (GstSunAudioMixerCtrl * mixer)
return FALSE;
}
+ mixer->mixer_fd = fd;
+
/* Try to set the multiple open flag if we can, but ignore errors */
ioctl (mixer->mixer_fd, AUDIO_MIXER_MULTIPLE_OPEN);
- mixer->mixer_fd = fd;
return TRUE;
}