From d516d16129c2d4abec06967f43de5ded7aa05688 Mon Sep 17 00:00:00 2001 From: Siarzhuk Zharski Date: Thu, 22 Aug 2013 10:52:26 +0200 Subject: [PATCH] USB audio/SiS7018: Set controls_count on list mix ioctl Looks like it works with default controls count 128 on default Haiku builds but force media-addons-server to crash in case KDEBUG_LEVEL is set to 0. Thanks to Vitaly Diger for pointing out and testing this issue. --- src/add-ons/kernel/drivers/audio/ac97/sis7018/Mixer.cpp | 2 ++ src/add-ons/kernel/drivers/audio/usb/AudioControlInterface.cpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/add-ons/kernel/drivers/audio/ac97/sis7018/Mixer.cpp b/src/add-ons/kernel/drivers/audio/ac97/sis7018/Mixer.cpp index 5ad29ee5995..d5056a48121 100644 --- a/src/add-ons/kernel/drivers/audio/ac97/sis7018/Mixer.cpp +++ b/src/add-ons/kernel/drivers/audio/ac97/sis7018/Mixer.cpp @@ -612,6 +612,8 @@ Mixer::ListMixControls(multi_mix_control_info* Info) _CreateMIXControlGroup(Info, index, recordGroup, RecordControls[i]); } + Info->control_count = index; + return B_OK; } diff --git a/src/add-ons/kernel/drivers/audio/usb/AudioControlInterface.cpp b/src/add-ons/kernel/drivers/audio/usb/AudioControlInterface.cpp index 042817ea413..1a20f7c91c3 100644 --- a/src/add-ons/kernel/drivers/audio/usb/AudioControlInterface.cpp +++ b/src/add-ons/kernel/drivers/audio/usb/AudioControlInterface.cpp @@ -1855,6 +1855,8 @@ AudioControlInterface::ListMixControls(multi_mix_control_info* Info) I != MixerControlsMap.End(); I++) _ListMixControlsForMixerUnit(index, Info, I->Value()); + Info->control_count = index; + return B_OK; }