Merge branch 'fix/asoc' into for-linus

* fix/asoc:
  ASoC: Fix errors in WM8990