Merge remote-tracking branches 'asoc/topic/intel', 'asoc/topic/kirkwood', 'asoc/topic...

diff --cc sound/soc/codecs/lm49453.c
Simple merge

diff --cc sound/soc/codecs/max98088.c
Simple merge

diff --cc sound/soc/intel/atom/sst-atom-controls.c
Simple merge

diff --cc sound/soc/intel/atom/sst/sst_drv_interface.c
index 0e0e4d9,27a9653,620da1d,620da1d,620da1d,620da1d..ce689c5
--- 1/sound/soc/intel/atom/sst/sst_drv_interface.c
--- 2/sound/soc/intel/atom/sst/sst_drv_interface.c
--- 3/sound/soc/intel/atom/sst/sst_drv_interface.c
--- 4/sound/soc/intel/atom/sst/sst_drv_interface.c
--- 5/sound/soc/intel/atom/sst/sst_drv_interface.c
--- 6/sound/soc/intel/atom/sst/sst_drv_interface.c
+++ b/sound/soc/intel/atom/sst/sst_drv_interface.c
@@@@@@@ -146,11 -141,18 -141,17 -141,17 -141,17 -141,17 +146,12 @@@@@@@ static int sst_power_control(struct dev
        int ret = 0;
        int usage_count = 0;
      
 -----#ifdef CONFIG_PM
 -----  usage_count = atomic_read(&dev->power.usage_count);
 -----#else
 -----  usage_count = 1;
 -----#endif
 -----
        if (state == true) {
                ret = pm_runtime_get_sync(dev);
 -----
 +++++          usage_count = GET_USAGE_COUNT(dev);
                dev_dbg(ctx->dev, "Enable: pm usage count: %d\n", usage_count);
                if (ret < 0) {
+ ++++                  pm_runtime_put_sync(dev);
                        dev_err(ctx->dev, "Runtime get failed with err: %d\n", ret);
                        return ret;
                }