Merge remote-tracking branches 'asoc/fix/atmel', 'asoc/fix/fsl', 'asoc/fix/tegra...

diff --combined sound/soc/fsl/imx-wm8962.c
index 61e48852b9e8bd21b26eec98cca4fc9ba0eea145,61e48852b9e8bd21b26eec98cca4fc9ba0eea145,72718e19a3c76855ec66e9ff02dc9c5dcb4067d6,61e48852b9e8bd21b26eec98cca4fc9ba0eea145,61e48852b9e8bd21b26eec98cca4fc9ba0eea145..3fd76bc391de19a2431dd320d0abfbdcd9616cf5
--- 1/sound/soc/fsl/imx-wm8962.c
--- 2/sound/soc/fsl/imx-wm8962.c
--- 3/sound/soc/fsl/imx-wm8962.c
--- 4/sound/soc/fsl/imx-wm8962.c
--- 5/sound/soc/fsl/imx-wm8962.c
+++ b/sound/soc/fsl/imx-wm8962.c
@@@@@@ -130,8 -130,8 -130,6 -130,8 -130,8 +130,6 @@@@@@ static int imx_wm8962_set_bias_level(st
                break;
        }
     
-- --   dapm->bias_level = level;
-- --
        return 0;
     }
     
@@@@@@ -215,7 -215,7 -213,7 -215,7 -215,7 +213,7 @@@@@@ static int imx_wm8962_probe(struct plat
                goto fail;
        }
        codec_dev = of_find_i2c_device_by_node(codec_np);
  -     if (!codec_dev || !codec_dev->driver) {
  +     if (!codec_dev || !codec_dev->dev.driver) {
                dev_err(&pdev->dev, "failed to find codec platform device\n");
                ret = -EINVAL;
                goto fail;
@@@@@@ -279,7 -279,7 -277,8 -279,7 -279,7 +277,7 @@@@@@
        return 0;
     
     clk_fail:
  -     if (!IS_ERR(data->codec_clk))
  -             clk_disable_unprepare(data->codec_clk);
  +     clk_disable_unprepare(data->codec_clk);
     fail:
        if (ssi_np)
                of_node_put(ssi_np);