The commmit dfed0ef9 was reverted
accidentally by the merge of auto-detection fix patch.

Fixed again now.
Signed-off-by: Takashi Iwai <tiwai@suse.de>