Merge tag 'asoc-v4.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Updates for v4.1

More updates for v4.1, pretty much all drivers:

 - Lots of cleanups from Lars, mainly moving things from the CODEC level
   to the card level.
 - Continuing improvements to rcar from Morimoto-san, pcm512x from
   Howard and Peter, the Intel platforms from Vinod, Jie, Jin and Han,
   and to rt5670 from Bard.
 - Support for some non-DSP Qualcomm platforms, Google's Storm
   platform, Maxmim MAX98925 CODECs and the Ingenic JZ4780 SoC.

1 files changed, 2 insertions, 2 deletions

diff --git a/sound/soc/codecs/cs4271.c b/sound/soc/codecs/cs4271.c
index 7d3a6accaf9a..e770ee6f36da 100644
--- a/sound/soc/codecs/cs4271.c
+++ b/sound/soc/codecs/cs4271.c
@@ -561,10 +561,10 @@ static int cs4271_codec_probe(struct snd_soc_codec *codec)
         if (gpio_is_valid(cs4271->gpio_nreset)) {
                 /* Reset codec */
                 gpio_direction_output(cs4271->gpio_nreset, 0);
-                udelay(1);
+                mdelay(1);
                 gpio_set_value(cs4271->gpio_nreset, 1);
                 /* Give the codec time to wake up */
-                udelay(1);
+                mdelay(1);
         }
 
         ret = regmap_update_bits(cs4271->regmap, CS4271_MODE2,