Merge "ASoC: update drivers to handle errors correctly"