diff options
author | Brian Cameron <brian.cameron@sun.com> | 2008-12-07 19:22:48 +0000 |
---|---|---|
committer | Sebastian Dröge <slomo@circular-chaos.org> | 2008-12-07 19:22:48 +0000 |
commit | 2020290c48846b1c53d770477902acc30da2eeb4 (patch) | |
tree | 9817f1427ad392892ce88c222f09bad7e168e9c1 | |
parent | 9f2e7127dc338e3cc6287ab87caa2c0449290ec2 (diff) |
sys/sunaudio/gstsunaudiomixerctrl.c: Set the mixer fd before calling ioctl() on it. Fixes bug #563414.
Original commit message from CVS:
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.
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | sys/sunaudio/gstsunaudiomixerctrl.c | 3 |
2 files changed, 10 insertions, 1 deletions
@@ -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; } |