Merge branch 'rcar-3.9.4/audio.rc2' into v4.14.75-ltsi/rcar-3.9.6

* rcar-3.9.4/audio.rc2:
  ASoC: rsnd: fixup 6ch settings to 8ch
  ASoC: rsnd: src: Avoid a potential deadlock