soundfix part 2

Conflicts:
	sound/soc/tegra/tegra_pcm.c