ALSA: hda - Fix left-over merge issues in patch_hdmi.c