This reverts commit 57a04513.

Harald Dunkel reports that it broke sound for him:
  "Alsa stopped working for me.  I still can access /dev/dsp, change the
   volume and so on, but the speakers are quiet."

Reverting it fixed things for him.
Reported-and-tested-by: NHarald Dunkel <harald.dunkel@t-online.de>
Acked-by: NTakashi Iwai <tiwai@suse.de>
Acked-by: NIngo Molnar <mingo@elte.hu>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>