Fix an audible pop described in <http://dev.laptop.org/ticket/977>.  Originally
based upon fixes by Mitch Bradley and Chris Ball.
Signed-off-by: Andres Salomon <dilinger@debian.org>