Merge branch 'topic/snd_card_new-err' into for-linus