From: Mark Brown <broonie@kernel.org>
Date: Sun, 30 Aug 2015 14:54:38 +0000 (+0100)
Subject: Merge remote-tracking branches 'asoc/topic/intel', 'asoc/topic/kirkwood', 'asoc/topic... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=373e515d655086d4c05aae3b098bd48fe1f0c382;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge remote-tracking branches 'asoc/topic/intel', 'asoc/topic/kirkwood', 'asoc/topic/lm49453', 'asoc/topic/max9768' and 'asoc/topic/max98088' into asoc-next
---

373e515d655086d4c05aae3b098bd48fe1f0c382
diff --cc sound/soc/intel/atom/sst/sst_drv_interface.c
index 0e0e4d9c021f,27a9653aa3d9,620da1d1b9e3,620da1d1b9e3,620da1d1b9e3,620da1d1b9e3..ce689c5af5ab
--- a/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;
      		}