Comment # 3 on bug 997639 from Takashi Iwai

I merged the fix to master and stable branches.

But it's not cleanly applicable to older kernels.  Neil, could you take a look
at it?