From 74bdfeb5ddedc3c447aa7143729e84a5d1353603 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Tue, 24 Jul 2012 11:53:35 +0200 Subject: [PATCH] Revert "sound: workaround softvol channels initialization by running dummy aplay and arecord" Reported to hang boot on a DELL Optiplex 755 with: 00:1b.0 Audio device: Intel Corporation 82801I (ICH9 Family) HD Audio Controller (rev 02) Subsystem: Dell Optiplex 755 Codec: Analog Devices AD1984 Address: 0 AFG Function Id: 0x1 (unsol 0) Vendor Id: 0x11d41984 Subsystem Id: 0x10280211 Revision Id: 0x100400 A recent patch to libalsa should be the upstream solution to the KWin crash problem this patch was intended to fix. This reverts commit 30e0db1d2c5fbd53a23ffd3318c24d759bc23587. --- postplug.d/35sound | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/postplug.d/35sound b/postplug.d/35sound index 1772b52..f5bf9d4 100644 --- a/postplug.d/35sound +++ b/postplug.d/35sound @@ -93,11 +93,7 @@ if [ "$SOUND_FORCE_RESCAN" != "on" -a "$SOUND_FORCE_RESCAN" != "1" ]; then fi fi -# WORKAROUND: custom softvol controls are not actived until a play/rec is done -# this also triggers kmix crash problem at first boot -aplay -q -d1 < /dev/zero -arecord -q -d1 > /dev/null - +echo "$SOUND_DEV" > $postpluglibdir/sound.cache for c in /proc/asound/card[0-9]*; do id=`cat $c/id` codec=`grep Codec: $c/codec* 2>/dev/null | head -n1` @@ -108,7 +104,9 @@ done if [ -x /usr/sbin/alsactl ]; then logmsg "$me" $"saving the mixer setup (/var/lib/sound/asound.state)" - /usr/sbin/alsactl store > /dev/null + /usr/sbin/alsactl store >/dev/null fi + echo "$SOUND_DEV" > $postpluglibdir/sound.cache + exit 0