35 files changed, 192 insertions, 120 deletions

diff --git a/sound/soc/blackfin/bf5xx-sport.c b/sound/soc/blackfin/bf5xx-sport.c
index 695351241db8..9dfa1241ea66 100644
--- a/sound/soc/blackfin/bf5xx-sport.c
+++ b/sound/soc/blackfin/bf5xx-sport.c
@@ -179,8 +179,9 @@ static inline int sport_hook_rx_dummy(struct sport_device *sport)
         struct dmasg *desc, temp_desc;
         unsigned long flags;
 
-        BUG_ON(sport->dummy_rx_desc == NULL);
-        BUG_ON(sport->curr_rx_desc == sport->dummy_rx_desc);
+        if (WARN_ON(!sport->dummy_rx_desc) ||
+            WARN_ON(sport->curr_rx_desc == sport->dummy_rx_desc))
+                return -EINVAL;
 
         /* Maybe the dummy buffer descriptor ring is damaged */
         sport->dummy_rx_desc->next_desc_addr = sport->dummy_rx_desc + 1;
@@ -250,8 +251,9 @@ int sport_rx_start(struct sport_device *sport)
                 return -EBUSY;
         if (sport->tx_run) {
                 /* tx is running, rx is not running */
-                BUG_ON(sport->dma_rx_desc == NULL);
-                BUG_ON(sport->curr_rx_desc != sport->dummy_rx_desc);
+                if (WARN_ON(!sport->dma_rx_desc) ||
+                    WARN_ON(sport->curr_rx_desc != sport->dummy_rx_desc))
+                        return -EINVAL;
                 local_irq_save(flags);
                 while ((get_dma_curr_desc_ptr(sport->dma_rx_chan) -
                         sizeof(struct dmasg)) != sport->dummy_rx_desc)
@@ -298,8 +300,9 @@ static inline int sport_hook_tx_dummy(struct sport_device *sport)
         struct dmasg *desc, temp_desc;
         unsigned long flags;
 
-        BUG_ON(sport->dummy_tx_desc == NULL);
-        BUG_ON(sport->curr_tx_desc == sport->dummy_tx_desc);
+        if (WARN_ON(!sport->dummy_tx_desc) ||
+            WARN_ON(sport->curr_tx_desc == sport->dummy_tx_desc))
+                return -EINVAL;
 
         sport->dummy_tx_desc->next_desc_addr = sport->dummy_tx_desc + 1;
 
@@ -331,8 +334,9 @@ int sport_tx_start(struct sport_device *sport)
         if (sport->tx_run)
                 return -EBUSY;
         if (sport->rx_run) {
-                BUG_ON(sport->dma_tx_desc == NULL);
-                BUG_ON(sport->curr_tx_desc != sport->dummy_tx_desc);
+                if (WARN_ON(!sport->dma_tx_desc) ||
+                    WARN_ON(sport->curr_tx_desc != sport->dummy_tx_desc))
+                        return -EINVAL;
                 /* Hook the normal buffer descriptor */
                 local_irq_save(flags);
                 while ((get_dma_curr_desc_ptr(sport->dma_tx_chan) -
@@ -767,7 +771,8 @@ static irqreturn_t err_handler(int irq, void *dev_id)
 int sport_set_rx_callback(struct sport_device *sport,
                        void (*rx_callback)(void *), void *rx_data)
 {
-        BUG_ON(rx_callback == NULL);
+        if (WARN_ON(!rx_callback))
+                return -EINVAL;
         sport->rx_callback = rx_callback;
         sport->rx_data = rx_data;
 
@@ -778,7 +783,8 @@ EXPORT_SYMBOL(sport_set_rx_callback);
 int sport_set_tx_callback(struct sport_device *sport,
                 void (*tx_callback)(void *), void *tx_data)
 {
-        BUG_ON(tx_callback == NULL);
+        if (WARN_ON(!tx_callback))
+                return -EINVAL;
         sport->tx_callback = tx_callback;
         sport->tx_data = tx_data;
 
@@ -789,7 +795,8 @@ EXPORT_SYMBOL(sport_set_tx_callback);
 int sport_set_err_callback(struct sport_device *sport,
                 void (*err_callback)(void *), void *err_data)
 {
-        BUG_ON(err_callback == NULL);
+        if (WARN_ON(!err_callback))
+                return -EINVAL;
         sport->err_callback = err_callback;
         sport->err_data = err_data;
 
@@ -856,7 +863,8 @@ struct sport_device *sport_init(struct platform_device *pdev,
 
         param.wdsize = wdsize;
         param.dummy_count = dummy_count;
-        BUG_ON(param.wdsize == 0 || param.dummy_count == 0);
+        if (WARN_ON(param.wdsize == 0 || param.dummy_count == 0))
+                return NULL;
 
         ret = sport_config_pdev(pdev, &param);
         if (ret)
diff --git a/sound/soc/codecs/max98088.c b/sound/soc/codecs/max98088.c
index 66ceee22fdad..53d7dab4e054 100644
--- a/sound/soc/codecs/max98088.c
+++ b/sound/soc/codecs/max98088.c
@@ -568,8 +568,9 @@ static void m98088_eq_band(struct snd_soc_codec *codec, unsigned int dai,
        unsigned int eq_reg;
        unsigned int i;
 
-       BUG_ON(band > 4);
-       BUG_ON(dai > 1);
+        if (WARN_ON(band > 4) ||
+            WARN_ON(dai > 1))
+                return;
 
        /* Load the base register address */
        eq_reg = dai ? M98088_REG_84_DAI2_EQ_BASE : M98088_REG_52_DAI1_EQ_BASE;
@@ -909,7 +910,8 @@ static int max98088_line_pga(struct snd_soc_dapm_widget *w,
        struct max98088_priv *max98088 = snd_soc_codec_get_drvdata(codec);
        u8 *state;
 
-       BUG_ON(!((channel == 1) || (channel == 2)));
+        if (WARN_ON(!(channel == 1 || channel == 2)))
+                return -EINVAL;
 
        switch (line) {
        case LINE_INA:
diff --git a/sound/soc/codecs/max98095.c b/sound/soc/codecs/max98095.c
index 8fb072455802..67244315c721 100644
--- a/sound/soc/codecs/max98095.c
+++ b/sound/soc/codecs/max98095.c
@@ -516,8 +516,9 @@ static void m98095_eq_band(struct snd_soc_codec *codec, unsigned int dai,
         unsigned int eq_reg;
         unsigned int i;
 
-        BUG_ON(band > 4);
-        BUG_ON(dai > 1);
+        if (WARN_ON(band > 4) ||
+            WARN_ON(dai > 1))
+                return;
 
         /* Load the base register address */
         eq_reg = dai ? M98095_142_DAI2_EQ_BASE : M98095_110_DAI1_EQ_BASE;
@@ -541,8 +542,9 @@ static void m98095_biquad_band(struct snd_soc_codec *codec, unsigned int dai,
         unsigned int bq_reg;
         unsigned int i;
 
-        BUG_ON(band > 1);
-        BUG_ON(dai > 1);
+        if (WARN_ON(band > 1) ||
+            WARN_ON(dai > 1))
+                return;
 
         /* Load the base register address */
         bq_reg = dai ? M98095_17E_DAI2_BQ_BASE : M98095_174_DAI1_BQ_BASE;
@@ -890,7 +892,8 @@ static int max98095_line_pga(struct snd_soc_dapm_widget *w,
         struct max98095_priv *max98095 = snd_soc_codec_get_drvdata(codec);
         u8 *state;
 
-        BUG_ON(!((channel == 1) || (channel == 2)));
+        if (WARN_ON(!(channel == 1 || channel == 2)))
+                return -EINVAL;
 
         state = &max98095->lin_state;
 
@@ -1740,7 +1743,8 @@ static int max98095_put_eq_enum(struct snd_kcontrol *kcontrol,
         int fs, best, best_val, i;
         int regmask, regsave;
 
-        BUG_ON(channel > 1);
+        if (WARN_ON(channel > 1))
+                return -EINVAL;
 
         if (!pdata || !max98095->eq_textcnt)
                 return 0;
diff --git a/sound/soc/codecs/tpa6130a2.c b/sound/soc/codecs/tpa6130a2.c
index 998555f2a8aa..b27c396037d4 100644
--- a/sound/soc/codecs/tpa6130a2.c
+++ b/sound/soc/codecs/tpa6130a2.c
@@ -56,7 +56,8 @@ static int tpa6130a2_i2c_read(int reg)
         struct tpa6130a2_data *data;
         int val;
 
-        BUG_ON(tpa6130a2_client == NULL);
+        if (WARN_ON(!tpa6130a2_client))
+                return -EINVAL;
         data = i2c_get_clientdata(tpa6130a2_client);
 
         /* If powered off, return the cached value */
@@ -78,7 +79,8 @@ static int tpa6130a2_i2c_write(int reg, u8 value)
         struct tpa6130a2_data *data;
         int val = 0;
 
-        BUG_ON(tpa6130a2_client == NULL);
+        if (WARN_ON(!tpa6130a2_client))
+                return -EINVAL;
         data = i2c_get_clientdata(tpa6130a2_client);
 
         if (data->power_state) {
@@ -99,7 +101,8 @@ static u8 tpa6130a2_read(int reg)
 {
         struct tpa6130a2_data *data;
 
-        BUG_ON(tpa6130a2_client == NULL);
+        if (WARN_ON(!tpa6130a2_client))
+                return 0;
         data = i2c_get_clientdata(tpa6130a2_client);
 
         return data->regs[reg];
@@ -110,7 +113,8 @@ static int tpa6130a2_initialize(void)
         struct tpa6130a2_data *data;
         int i, ret = 0;
 
-        BUG_ON(tpa6130a2_client == NULL);
+        if (WARN_ON(!tpa6130a2_client))
+                return -EINVAL;
         data = i2c_get_clientdata(tpa6130a2_client);
 
         for (i = 1; i < TPA6130A2_REG_VERSION; i++) {
@@ -128,7 +132,8 @@ static int tpa6130a2_power(u8 power)
         u8      val;
         int     ret = 0;
 
-        BUG_ON(tpa6130a2_client == NULL);
+        if (WARN_ON(!tpa6130a2_client))
+                return -EINVAL;
         data = i2c_get_clientdata(tpa6130a2_client);
 
         mutex_lock(&data->mutex);
@@ -194,7 +199,8 @@ static int tpa6130a2_get_volsw(struct snd_kcontrol *kcontrol,
         unsigned int mask = (1 << fls(max)) - 1;
         unsigned int invert = mc->invert;
 
-        BUG_ON(tpa6130a2_client == NULL);
+        if (WARN_ON(!tpa6130a2_client))
+                return -EINVAL;
         data = i2c_get_clientdata(tpa6130a2_client);
 
         mutex_lock(&data->mutex);
@@ -224,7 +230,8 @@ static int tpa6130a2_put_volsw(struct snd_kcontrol *kcontrol,
         unsigned int val = (ucontrol->value.integer.value[0] & mask);
         unsigned int val_reg;
 
-        BUG_ON(tpa6130a2_client == NULL);
+        if (WARN_ON(!tpa6130a2_client))
+                return -EINVAL;
         data = i2c_get_clientdata(tpa6130a2_client);
 
         if (invert)
diff --git a/sound/soc/codecs/wm0010.c b/sound/soc/codecs/wm0010.c
index bf7804a12863..71ce3159a62e 100644
--- a/sound/soc/codecs/wm0010.c
+++ b/sound/soc/codecs/wm0010.c
@@ -372,7 +372,8 @@ static int wm0010_firmware_load(const char *name, struct snd_soc_codec *codec)
         offset = 0;
         dsp = inforec->dsp_target;
         wm0010->boot_failed = false;
-        BUG_ON(!list_empty(&xfer_list));
+        if (WARN_ON(!list_empty(&xfer_list)))
+                return -EINVAL;
         init_completion(&done);
 
         /* First record should be INFO */
diff --git a/sound/soc/codecs/wm2000.c b/sound/soc/codecs/wm2000.c
index 7fefd766b582..8ae50274ea8f 100644
--- a/sound/soc/codecs/wm2000.c
+++ b/sound/soc/codecs/wm2000.c
@@ -137,7 +137,8 @@ static int wm2000_power_up(struct i2c_client *i2c, int analogue)
         unsigned long rate;
         int ret;
 
-        BUG_ON(wm2000->anc_mode != ANC_OFF);
+        if (WARN_ON(wm2000->anc_mode != ANC_OFF))
+                return -EINVAL;
 
         dev_dbg(&i2c->dev, "Beginning power up\n");
 
@@ -277,7 +278,8 @@ static int wm2000_enter_bypass(struct i2c_client *i2c, int analogue)
 {
         struct wm2000_priv *wm2000 = dev_get_drvdata(&i2c->dev);
 
-        BUG_ON(wm2000->anc_mode != ANC_ACTIVE);
+        if (WARN_ON(wm2000->anc_mode != ANC_ACTIVE))
+                return -EINVAL;
 
         if (analogue) {
                 wm2000_write(i2c, WM2000_REG_SYS_MODE_CNTRL,
@@ -315,7 +317,8 @@ static int wm2000_exit_bypass(struct i2c_client *i2c, int analogue)
 {
         struct wm2000_priv *wm2000 = dev_get_drvdata(&i2c->dev);
 
-        BUG_ON(wm2000->anc_mode != ANC_BYPASS);
+        if (WARN_ON(wm2000->anc_mode != ANC_BYPASS))
+                return -EINVAL;
         
         wm2000_write(i2c, WM2000_REG_SYS_CTL1, 0);
 
@@ -349,7 +352,8 @@ static int wm2000_enter_standby(struct i2c_client *i2c, int analogue)
 {
         struct wm2000_priv *wm2000 = dev_get_drvdata(&i2c->dev);
 
-        BUG_ON(wm2000->anc_mode != ANC_ACTIVE);
+        if (WARN_ON(wm2000->anc_mode != ANC_ACTIVE))
+                return -EINVAL;
 
         if (analogue) {
                 wm2000_write(i2c, WM2000_REG_ANA_VMID_PD_TIME, 248 / 4);
@@ -392,7 +396,8 @@ static int wm2000_exit_standby(struct i2c_client *i2c, int analogue)
 {
         struct wm2000_priv *wm2000 = dev_get_drvdata(&i2c->dev);
 
-        BUG_ON(wm2000->anc_mode != ANC_STANDBY);
+        if (WARN_ON(wm2000->anc_mode != ANC_STANDBY))
+                return -EINVAL;
 
         wm2000_write(i2c, WM2000_REG_SYS_CTL1, 0);
 
diff --git a/sound/soc/codecs/wm5100.c b/sound/soc/codecs/wm5100.c
index ac1745d030d6..4cf91deabc02 100644
--- a/sound/soc/codecs/wm5100.c
+++ b/sound/soc/codecs/wm5100.c
@@ -1972,7 +1972,8 @@ static void wm5100_set_detect_mode(struct wm5100_priv *wm5100, int the_mode)
 {
         struct wm5100_jack_mode *mode = &wm5100->pdata.jack_modes[the_mode];
 
-        BUG_ON(the_mode >= ARRAY_SIZE(wm5100->pdata.jack_modes));
+        if (WARN_ON(the_mode >= ARRAY_SIZE(wm5100->pdata.jack_modes)))
+                return;
 
         gpio_set_value_cansleep(wm5100->pdata.hp_pol, mode->hp_pol);
         regmap_update_bits(wm5100->regmap, WM5100_ACCESSORY_DETECT_MODE_1,
diff --git a/sound/soc/codecs/wm8350.c b/sound/soc/codecs/wm8350.c
index af1318ddb062..a183dcf3d5c1 100644
--- a/sound/soc/codecs/wm8350.c
+++ b/sound/soc/codecs/wm8350.c
@@ -274,7 +274,7 @@ static int pga_event(struct snd_soc_dapm_widget *w,
                 break;
 
         default:
-                BUG();
+                WARN(1, "Invalid shift %d\n", w->shift);
                 return -1;
         }
 
diff --git a/sound/soc/codecs/wm8580.c b/sound/soc/codecs/wm8580.c
index 5e9c40fa7eb2..08a414b57b1e 100644
--- a/sound/soc/codecs/wm8580.c
+++ b/sound/soc/codecs/wm8580.c
@@ -736,7 +736,7 @@ static int wm8580_set_sysclk(struct snd_soc_dai *dai, int clk_id,
                 break;
 
         default:
-                BUG_ON("Unknown DAI driver ID\n");
+                WARN(1, "Unknown DAI driver ID\n");
                 return -EINVAL;
         }
 
diff --git a/sound/soc/codecs/wm8776.c b/sound/soc/codecs/wm8776.c
index f31017ed1381..942d58e455f3 100644
--- a/sound/soc/codecs/wm8776.c
+++ b/sound/soc/codecs/wm8776.c
@@ -325,7 +325,8 @@ static int wm8776_set_sysclk(struct snd_soc_dai *dai,
         struct snd_soc_codec *codec = dai->codec;
         struct wm8776_priv *wm8776 = snd_soc_codec_get_drvdata(codec);
 
-        BUG_ON(dai->driver->id >= ARRAY_SIZE(wm8776->sysclk));
+        if (WARN_ON(dai->driver->id >= ARRAY_SIZE(wm8776->sysclk)))
+                return -EINVAL;
 
         wm8776->sysclk[dai->driver->id] = freq;
 
diff --git a/sound/soc/codecs/wm8900.c b/sound/soc/codecs/wm8900.c
index 7c8257c5a17b..734209e252c3 100644
--- a/sound/soc/codecs/wm8900.c
+++ b/sound/soc/codecs/wm8900.c
@@ -279,7 +279,8 @@ static int wm8900_hp_event(struct snd_soc_dapm_widget *w,
                 break;
 
         default:
-                BUG();
+                WARN(1, "Invalid event %d\n", event);
+                break;
         }
 
         return 0;
@@ -691,7 +692,8 @@ static int fll_factors(struct _fll_div *fll_div, unsigned int Fref,
         unsigned int K, Ndiv, Nmod, target;
         unsigned int div;
 
-        BUG_ON(!Fout);
+        if (WARN_ON(!Fout))
+                return -EINVAL;
 
         /* The FLL must run at 90-100MHz which is then scaled down to
          * the output value by FLLCLK_DIV. */
@@ -742,8 +744,9 @@ static int fll_factors(struct _fll_div *fll_div, unsigned int Fref,
         /* Move down to proper range now rounding is done */
         fll_div->k = K / 10;
 
-        BUG_ON(target != Fout * (fll_div->fllclk_div << 2));
-        BUG_ON(!K && target != Fref * fll_div->fll_ratio * fll_div->n);
+        if (WARN_ON(target != Fout * (fll_div->fllclk_div << 2)) ||
+            WARN_ON(!K && target != Fref * fll_div->fll_ratio * fll_div->n))
+                return -EINVAL;
 
         return 0;
 }
diff --git a/sound/soc/codecs/wm8904.c b/sound/soc/codecs/wm8904.c
index 4dfa8dceeabf..3938fb1c203e 100644
--- a/sound/soc/codecs/wm8904.c
+++ b/sound/soc/codecs/wm8904.c
@@ -658,7 +658,8 @@ SOC_SINGLE_TLV("EQ5 Volume", WM8904_EQ6, 0, 24, 0, eq_tlv),
 static int cp_event(struct snd_soc_dapm_widget *w,
                     struct snd_kcontrol *kcontrol, int event)
 {
-        BUG_ON(event != SND_SOC_DAPM_POST_PMU);
+        if (WARN_ON(event != SND_SOC_DAPM_POST_PMU))
+                return -EINVAL;
 
         /* Maximum startup time */
         udelay(500);
@@ -740,7 +741,7 @@ static int out_pga_event(struct snd_soc_dapm_widget *w,
                 dcs_r = 3;
                 break;
         default:
-                BUG();
+                WARN(1, "Invalid reg %d\n", reg);
                 return -EINVAL;
         }
 
diff --git a/sound/soc/codecs/wm8958-dsp2.c b/sound/soc/codecs/wm8958-dsp2.c
index b0710d817a65..b7488f190d2b 100644
--- a/sound/soc/codecs/wm8958-dsp2.c
+++ b/sound/soc/codecs/wm8958-dsp2.c
@@ -348,7 +348,7 @@ static void wm8958_dsp_apply(struct snd_soc_codec *codec, int path, int start)
                 aif = 1;
                 break;
         default:
-                BUG();
+                WARN(1, "Invalid path %d\n", path);
                 return;
         }
 
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
index 3a2f96c5442c..ac1ff9947a90 100644
--- a/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
@@ -1853,7 +1853,7 @@ static int cp_event(struct snd_soc_dapm_widget *w,
                 break;
 
         default:
-                BUG();
+                WARN(1, "Invalid event %d\n", event);
                 return -EINVAL;
         }
 
@@ -1945,7 +1945,7 @@ static int hp_event(struct snd_soc_dapm_widget *w,
                 break;
 
         default:
-                BUG();
+                WARN(1, "Invalid event %d\n", event);
                 return -EINVAL;
         
         }
@@ -1974,7 +1974,7 @@ static int out_pga_event(struct snd_soc_dapm_widget *w,
                 reg = WM8962_SPKOUTL_VOLUME;
                 break;
         default:
-                BUG();
+                WARN(1, "Invalid shift %d\n", w->shift);
                 return -EINVAL;
         }
 
@@ -1982,7 +1982,7 @@ static int out_pga_event(struct snd_soc_dapm_widget *w,
         case SND_SOC_DAPM_POST_PMU:
                 return snd_soc_write(codec, reg, snd_soc_read(codec, reg));
         default:
-                BUG();
+                WARN(1, "Invalid event %d\n", event);
                 return -EINVAL;
         }
 }
@@ -2005,7 +2005,7 @@ static int dsp2_event(struct snd_soc_dapm_widget *w,
                 break;
 
         default:
-                BUG();
+                WARN(1, "Invalid event %d\n", event);
                 return -EINVAL;
         }
 
diff --git a/sound/soc/codecs/wm8996.c b/sound/soc/codecs/wm8996.c
index b70379ebd142..1a7655b0aa22 100644
--- a/sound/soc/codecs/wm8996.c
+++ b/sound/soc/codecs/wm8996.c
@@ -610,7 +610,7 @@ static int bg_event(struct snd_soc_dapm_widget *w,
                 wm8996_bg_disable(codec);
                 break;
         default:
-                BUG();
+                WARN(1, "Invalid event %d\n", event);
                 ret = -EINVAL;
         }
 
@@ -627,7 +627,7 @@ static int cp_event(struct snd_soc_dapm_widget *w,
                 msleep(5);
                 break;
         default:
-                BUG();
+                WARN(1, "Invalid event %d\n", event);
                 ret = -EINVAL;
         }
 
@@ -648,7 +648,7 @@ static int rmv_short_event(struct snd_soc_dapm_widget *w,
                 wm8996->hpout_pending |= w->shift;
                 break;
         default:
-                BUG();
+                WARN(1, "Invalid event %d\n", event);
                 return -EINVAL;
         }
 
@@ -769,7 +769,7 @@ static int dcs_start(struct snd_soc_dapm_widget *w,
                 wm8996->dcs_pending |= 1 << w->shift;
                 break;
         default:
-                BUG();
+                WARN(1, "Invalid event %d\n", event);
                 return -EINVAL;
         }
 
@@ -1658,7 +1658,7 @@ static int wm8996_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
                 lrclk_rx_reg = WM8996_AIF2_RX_LRCLK_2;
                 break;
         default:
-                BUG();
+                WARN(1, "Invalid dai id %d\n", dai->id);
                 return -EINVAL;
         }
 
@@ -1770,7 +1770,7 @@ static int wm8996_hw_params(struct snd_pcm_substream *substream,
                 dsp_shift = WM8996_DSP2_DIV_SHIFT;
                 break;
         default:
-                BUG();
+                WARN(1, "Invalid dai id %d\n", dai->id);
                 return -EINVAL;
         }
 
diff --git a/sound/soc/codecs/wm9713.c b/sound/soc/codecs/wm9713.c
index a53e175c015a..acea8927905b 100644
--- a/sound/soc/codecs/wm9713.c
+++ b/sound/soc/codecs/wm9713.c
@@ -221,7 +221,8 @@ static int wm9713_voice_shutdown(struct snd_soc_dapm_widget *w,
         struct snd_soc_codec *codec = w->codec;
         u16 status, rate;
 
-        BUG_ON(event != SND_SOC_DAPM_PRE_PMD);
+        if (WARN_ON(event != SND_SOC_DAPM_PRE_PMD))
+                return -EINVAL;
 
         /* Gracefully shut down the voice interface. */
         status = ac97_read(codec, AC97_EXTENDED_MID) | 0x1000;
diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c
index 53b6033658a6..46ec0e9744d4 100644
--- a/sound/soc/codecs/wm_adsp.c
+++ b/sound/soc/codecs/wm_adsp.c
@@ -341,6 +341,8 @@ static struct wm_adsp_region const *wm_adsp_find_region(struct wm_adsp *dsp,
 static unsigned int wm_adsp_region_to_reg(struct wm_adsp_region const *region,
                                           unsigned int offset)
 {
+        if (WARN_ON(!region))
+                return offset;
         switch (region->type) {
         case WMFW_ADSP1_PM:
                 return region->base + (offset * 3);
@@ -353,7 +355,7 @@ static unsigned int wm_adsp_region_to_reg(struct wm_adsp_region const *region,
         case WMFW_ADSP1_ZM:
                 return region->base + (offset * 2);
         default:
-                WARN_ON(NULL != "Unknown memory region type");
+                WARN(1, "Unknown memory region type");
                 return offset;
         }
 }
@@ -605,7 +607,7 @@ static int wm_adsp_load(struct wm_adsp *dsp)
                 break;
 
         default:
-                BUG_ON(NULL == "Unknown DSP type");
+                WARN(1, "Unknown DSP type");
                 goto out_fw;
         }
 
@@ -645,27 +647,22 @@ static int wm_adsp_load(struct wm_adsp *dsp)
                         reg = offset;
                         break;
                 case WMFW_ADSP1_PM:
-                        BUG_ON(!mem);
                         region_name = "PM";
                         reg = wm_adsp_region_to_reg(mem, offset);
                         break;
                 case WMFW_ADSP1_DM:
-                        BUG_ON(!mem);
                         region_name = "DM";
                         reg = wm_adsp_region_to_reg(mem, offset);
                         break;
                 case WMFW_ADSP2_XM:
-                        BUG_ON(!mem);
                         region_name = "XM";
                         reg = wm_adsp_region_to_reg(mem, offset);
                         break;
                 case WMFW_ADSP2_YM:
-                        BUG_ON(!mem);
                         region_name = "YM";
                         reg = wm_adsp_region_to_reg(mem, offset);
                         break;
                 case WMFW_ADSP1_ZM:
-                        BUG_ON(!mem);
                         region_name = "ZM";
                         reg = wm_adsp_region_to_reg(mem, offset);
                         break;
@@ -905,10 +902,8 @@ static int wm_adsp_setup_algs(struct wm_adsp *dsp)
                 break;
         }
 
-        if (mem == NULL) {
-                BUG_ON(mem != NULL);
+        if (WARN_ON(!mem))
                 return -EINVAL;
-        }
 
         switch (dsp->type) {
         case WMFW_ADSP1:
@@ -1002,7 +997,7 @@ static int wm_adsp_setup_algs(struct wm_adsp *dsp)
                 break;
 
         default:
-                BUG_ON(NULL == "Unknown DSP type");
+                WARN(1, "Unknown DSP type");
                 return -EINVAL;
         }
 
@@ -1066,6 +1061,7 @@ static int wm_adsp_setup_algs(struct wm_adsp *dsp)
                         if (i + 1 < algs) {
                                 region->len = be32_to_cpu(adsp1_alg[i + 1].dm);
                                 region->len -= be32_to_cpu(adsp1_alg[i].dm);
+                                region->len *= 4;
                                 wm_adsp_create_control(dsp, region);
                         } else {
                                 adsp_warn(dsp, "Missing length info for region DM with ID %x\n",
@@ -1083,6 +1079,7 @@ static int wm_adsp_setup_algs(struct wm_adsp *dsp)
                         if (i + 1 < algs) {
                                 region->len = be32_to_cpu(adsp1_alg[i + 1].zm);
                                 region->len -= be32_to_cpu(adsp1_alg[i].zm);
+                                region->len *= 4;
                                 wm_adsp_create_control(dsp, region);
                         } else {
                                 adsp_warn(dsp, "Missing length info for region ZM with ID %x\n",
@@ -1112,6 +1109,7 @@ static int wm_adsp_setup_algs(struct wm_adsp *dsp)
                         if (i + 1 < algs) {
                                 region->len = be32_to_cpu(adsp2_alg[i + 1].xm);
                                 region->len -= be32_to_cpu(adsp2_alg[i].xm);
+                                region->len *= 4;
                                 wm_adsp_create_control(dsp, region);
                         } else {
                                 adsp_warn(dsp, "Missing length info for region XM with ID %x\n",
@@ -1129,6 +1127,7 @@ static int wm_adsp_setup_algs(struct wm_adsp *dsp)
                         if (i + 1 < algs) {
                                 region->len = be32_to_cpu(adsp2_alg[i + 1].ym);
                                 region->len -= be32_to_cpu(adsp2_alg[i].ym);
+                                region->len *= 4;
                                 wm_adsp_create_control(dsp, region);
                         } else {
                                 adsp_warn(dsp, "Missing length info for region YM with ID %x\n",
@@ -1146,6 +1145,7 @@ static int wm_adsp_setup_algs(struct wm_adsp *dsp)
                         if (i + 1 < algs) {
                                 region->len = be32_to_cpu(adsp2_alg[i + 1].zm);
                                 region->len -= be32_to_cpu(adsp2_alg[i].zm);
+                                region->len *= 4;
                                 wm_adsp_create_control(dsp, region);
                         } else {
                                 adsp_warn(dsp, "Missing length info for region ZM with ID %x\n",
diff --git a/sound/soc/codecs/wm_hubs.c b/sound/soc/codecs/wm_hubs.c
index 01daf655e20b..b371066dd5bc 100644
--- a/sound/soc/codecs/wm_hubs.c
+++ b/sound/soc/codecs/wm_hubs.c
@@ -611,7 +611,7 @@ static int earpiece_event(struct snd_soc_dapm_widget *w,
                 break;
 
         default:
-                BUG();
+                WARN(1, "Invalid event %d\n", event);
                 break;
         }
 
diff --git a/sound/soc/fsl/fsl_spdif.c b/sound/soc/fsl/fsl_spdif.c
index 76c742a09ef9..55193a5596ca 100644
--- a/sound/soc/fsl/fsl_spdif.c
+++ b/sound/soc/fsl/fsl_spdif.c
@@ -1107,11 +1107,6 @@ static int fsl_spdif_probe(struct platform_device *pdev)
 
         /* Get the addresses and IRQ */
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (!res) {
-                dev_err(&pdev->dev, "could not determine device resources\n");
-                return -ENXIO;
-        }
-
         regs = devm_ioremap_resource(&pdev->dev, res);
         if (IS_ERR(regs))
                 return PTR_ERR(regs);
diff --git a/sound/soc/fsl/imx-pcm-fiq.c b/sound/soc/fsl/imx-pcm-fiq.c
index 34043c55f2a6..10e330514ed8 100644
--- a/sound/soc/fsl/imx-pcm-fiq.c
+++ b/sound/soc/fsl/imx-pcm-fiq.c
@@ -39,8 +39,6 @@ struct imx_pcm_runtime_data {
         unsigned int period;
         int periods;
         unsigned long offset;
-        unsigned long last_offset;
-        unsigned long size;
         struct hrtimer hrt;
         int poll_time_ns;
         struct snd_pcm_substream *substream;
@@ -52,9 +50,7 @@ static enum hrtimer_restart snd_hrtimer_callback(struct hrtimer *hrt)
         struct imx_pcm_runtime_data *iprtd =
                 container_of(hrt, struct imx_pcm_runtime_data, hrt);
         struct snd_pcm_substream *substream = iprtd->substream;
-        struct snd_pcm_runtime *runtime = substream->runtime;
         struct pt_regs regs;
-        unsigned long delta;
 
         if (!atomic_read(&iprtd->running))
                 return HRTIMER_NORESTART;
@@ -66,19 +62,7 @@ static enum hrtimer_restart snd_hrtimer_callback(struct hrtimer *hrt)
         else
                 iprtd->offset = regs.ARM_r9 & 0xffff;
 
-        /* How much data have we transferred since the last period report? */
-        if (iprtd->offset >= iprtd->last_offset)
-                delta = iprtd->offset - iprtd->last_offset;
-        else
-                delta = runtime->buffer_size + iprtd->offset
-                        - iprtd->last_offset;
-
-        /* If we've transferred at least a period then report it and
-         * reset our poll time */
-        if (delta >= iprtd->period) {
-                snd_pcm_period_elapsed(substream);
-                iprtd->last_offset = iprtd->offset;
-        }
+        snd_pcm_period_elapsed(substream);
 
         hrtimer_forward_now(hrt, ns_to_ktime(iprtd->poll_time_ns));
 
@@ -95,11 +79,9 @@ static int snd_imx_pcm_hw_params(struct snd_pcm_substream *substream,
         struct snd_pcm_runtime *runtime = substream->runtime;
         struct imx_pcm_runtime_data *iprtd = runtime->private_data;
 
-        iprtd->size = params_buffer_bytes(params);
         iprtd->periods = params_periods(params);
-        iprtd->period = params_period_bytes(params) ;
+        iprtd->period = params_period_bytes(params);
         iprtd->offset = 0;
-        iprtd->last_offset = 0;
         iprtd->poll_time_ns = 1000000000 / params_rate(params) *
                                 params_period_size(params);
         snd_pcm_set_runtime_buffer(substream, &substream->dma_buffer);
diff --git a/sound/soc/fsl/imx-wm8962.c b/sound/soc/fsl/imx-wm8962.c
index 72064e995687..361f94f09b11 100644
--- a/sound/soc/fsl/imx-wm8962.c
+++ b/sound/soc/fsl/imx-wm8962.c
@@ -279,8 +279,7 @@ static int imx_wm8962_probe(struct platform_device *pdev)
         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);
diff --git a/sound/soc/mid-x86/sst_platform.c b/sound/soc/mid-x86/sst_platform.c
index 392fc0b8f5b8..b6b5eb698d33 100644
--- a/sound/soc/mid-x86/sst_platform.c
+++ b/sound/soc/mid-x86/sst_platform.c
@@ -40,7 +40,8 @@ static DEFINE_MUTEX(sst_lock);
 
 int sst_register_dsp(struct sst_device *dev)
 {
-        BUG_ON(!dev);
+        if (WARN_ON(!dev))
+                return -EINVAL;
         if (!try_module_get(dev->dev->driver->owner))
                 return -ENODEV;
         mutex_lock(&sst_lock);
@@ -59,7 +60,8 @@ EXPORT_SYMBOL_GPL(sst_register_dsp);
 
 int sst_unregister_dsp(struct sst_device *dev)
 {
-        BUG_ON(!dev);
+        if (WARN_ON(!dev))
+                return -EINVAL;
         if (dev != sst)
                 return -EINVAL;
 
diff --git a/sound/soc/omap/n810.c b/sound/soc/omap/n810.c
index 5e8d640d314f..6d216cb6c19b 100644
--- a/sound/soc/omap/n810.c
+++ b/sound/soc/omap/n810.c
@@ -344,8 +344,11 @@ static int __init n810_soc_init(void)
         clk_set_parent(sys_clkout2_src, func96m_clk);
         clk_set_rate(sys_clkout2, 12000000);
 
-        BUG_ON((gpio_request(N810_HEADSET_AMP_GPIO, "hs_amp") < 0) ||
-               (gpio_request(N810_SPEAKER_AMP_GPIO, "spk_amp") < 0));
+        if (WARN_ON((gpio_request(N810_HEADSET_AMP_GPIO, "hs_amp") < 0) ||
+                    (gpio_request(N810_SPEAKER_AMP_GPIO, "spk_amp") < 0))) {
+                err = -EINVAL;
+                goto err4;
+        }
 
         gpio_direction_output(N810_HEADSET_AMP_GPIO, 0);
         gpio_direction_output(N810_SPEAKER_AMP_GPIO, 0);
diff --git a/sound/soc/pxa/pxa2xx-i2s.c b/sound/soc/pxa/pxa2xx-i2s.c
index d5340a088858..c0d648d3339f 100644
--- a/sound/soc/pxa/pxa2xx-i2s.c
+++ b/sound/soc/pxa/pxa2xx-i2s.c
@@ -165,7 +165,8 @@ static int pxa2xx_i2s_hw_params(struct snd_pcm_substream *substream,
 {
         struct snd_dmaengine_dai_dma_data *dma_data;
 
-        BUG_ON(IS_ERR(clk_i2s));
+        if (WARN_ON(IS_ERR(clk_i2s)))
+                return -EINVAL;
         clk_prepare_enable(clk_i2s);
         clk_ena = 1;
         pxa_i2s_wait();
diff --git a/sound/soc/s6000/s6000-pcm.c b/sound/soc/s6000/s6000-pcm.c
index d0740a762963..5cfaa5464eba 100644
--- a/sound/soc/s6000/s6000-pcm.c
+++ b/sound/soc/s6000/s6000-pcm.c
@@ -90,7 +90,8 @@ static void s6000_pcm_enqueue_dma(struct snd_pcm_substream *substream)
                 return;
         }
 
-        BUG_ON(period_size & 15);
+        if (WARN_ON(period_size & 15))
+                return;
         s6dmac_put_fifo(DMA_MASK_DMAC(channel), DMA_INDEX_CHNL(channel),
                         src, dst, period_size);
 
diff --git a/sound/soc/sh/Kconfig b/sound/soc/sh/Kconfig
index 56d8ff6a402d..14011d90d70a 100644
--- a/sound/soc/sh/Kconfig
+++ b/sound/soc/sh/Kconfig
@@ -37,7 +37,6 @@ config SND_SOC_SH4_SIU
 config SND_SOC_RCAR
         tristate "R-Car series SRU/SCU/SSIU/SSI support"
         select SND_SIMPLE_CARD
-        select RCAR_CLK_ADG
         help
           This option enables R-Car SUR/SCU/SSIU/SSI sound support
 
diff --git a/sound/soc/sh/rcar/scu.c b/sound/soc/sh/rcar/scu.c
index 1ab1bce6be7f..f4453e33a847 100644
--- a/sound/soc/sh/rcar/scu.c
+++ b/sound/soc/sh/rcar/scu.c
@@ -198,7 +198,8 @@ static struct rsnd_mod_ops rsnd_scu_ops = {
 
 struct rsnd_mod *rsnd_scu_mod_get(struct rsnd_priv *priv, int id)
 {
-        BUG_ON(id < 0 || id >= rsnd_scu_nr(priv));
+        if (WARN_ON(id < 0 || id >= rsnd_scu_nr(priv)))
+                id = 0;
 
         return &((struct rsnd_scu *)(priv->scu) + id)->mod;
 }
diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c
index b71cf9d7dd3f..5ac20cd5e006 100644
--- a/sound/soc/sh/rcar/ssi.c
+++ b/sound/soc/sh/rcar/ssi.c
@@ -611,7 +611,8 @@ struct rsnd_mod *rsnd_ssi_mod_get_frm_dai(struct rsnd_priv *priv,
 
 struct rsnd_mod *rsnd_ssi_mod_get(struct rsnd_priv *priv, int id)
 {
-        BUG_ON(id < 0 || id >= rsnd_ssi_nr(priv));
+        if (WARN_ON(id < 0 || id >= rsnd_ssi_nr(priv)))
+                id = 0;
 
         return &(((struct rsnd_ssiu *)(priv->ssiu))->ssi + id)->mod;
 }
diff --git a/sound/soc/sh/siu_dai.c b/sound/soc/sh/siu_dai.c
index 9dc24ffa892a..d55babee14f8 100644
--- a/sound/soc/sh/siu_dai.c
+++ b/sound/soc/sh/siu_dai.c
@@ -543,7 +543,8 @@ static void siu_dai_shutdown(struct snd_pcm_substream *substream,
         /* Stop the siu if the other stream is not using it */
         if (!port_info->play_cap) {
                 /* during stmread or stmwrite ? */
-                BUG_ON(port_info->playback.rw_flg || port_info->capture.rw_flg);
+                if (WARN_ON(port_info->playback.rw_flg || port_info->capture.rw_flg))
+                        return;
                 siu_dai_spbstop(port_info);
                 siu_dai_stop(port_info);
         }
diff --git a/sound/soc/soc-cache.c b/sound/soc/soc-cache.c
index 1b6663f45b34..375dc6dfba4e 100644
--- a/sound/soc/soc-cache.c
+++ b/sound/soc/soc-cache.c
@@ -36,7 +36,8 @@ static bool snd_soc_set_cache_val(void *base, unsigned int idx,
                 break;
         }
         default:
-                BUG();
+                WARN(1, "Invalid word_size %d\n", word_size);
+                break;
         }
         return false;
 }
@@ -57,7 +58,8 @@ static unsigned int snd_soc_get_cache_val(const void *base, unsigned int idx,
                 return cache[idx];
         }
         default:
-                BUG();
+                WARN(1, "Invalid word_size %d\n", word_size);
+                break;
         }
         /* unreachable */
         return -1;
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index bdc1d74eb7b0..4e53d87e881d 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -662,6 +662,8 @@ int snd_soc_suspend(struct device *dev)
                                 codec->cache_sync = 1;
                                 if (codec->using_regmap)
                                         regcache_mark_dirty(codec->control_data);
+                                /* deactivate pins to sleep state */
+                                pinctrl_pm_select_sleep_state(codec->dev);
                                 break;
                         default:
                                 dev_dbg(codec->dev,
@@ -679,6 +681,9 @@ int snd_soc_suspend(struct device *dev)
 
                 if (cpu_dai->driver->suspend && cpu_dai->driver->ac97_control)
                         cpu_dai->driver->suspend(cpu_dai);
+
+                /* deactivate pins to sleep state */
+                pinctrl_pm_select_sleep_state(cpu_dai->dev);
         }
 
         if (card->suspend_post)
@@ -807,6 +812,16 @@ int snd_soc_resume(struct device *dev)
         if (list_empty(&card->codec_dev_list))
                 return 0;
 
+        /* activate pins from sleep state */
+        for (i = 0; i < card->num_rtd; i++) {
+                struct snd_soc_dai *cpu_dai = card->rtd[i].cpu_dai;
+                struct snd_soc_dai *codec_dai = card->rtd[i].codec_dai;
+                if (cpu_dai->active)
+                        pinctrl_pm_select_default_state(cpu_dai->dev);
+                if (codec_dai->active)
+                        pinctrl_pm_select_default_state(codec_dai->dev);
+        }
+
         /* AC97 devices might have other drivers hanging off them so
          * need to resume immediately.  Other drivers don't have that
          * problem and may take a substantial amount of time to resume
@@ -1929,6 +1944,14 @@ int snd_soc_poweroff(struct device *dev)
 
         snd_soc_dapm_shutdown(card);
 
+        /* deactivate pins to sleep state */
+        for (i = 0; i < card->num_rtd; i++) {
+                struct snd_soc_dai *cpu_dai = card->rtd[i].cpu_dai;
+                struct snd_soc_dai *codec_dai = card->rtd[i].codec_dai;
+                pinctrl_pm_select_sleep_state(codec_dai->dev);
+                pinctrl_pm_select_sleep_state(cpu_dai->dev);
+        }
+
         return 0;
 }
 EXPORT_SYMBOL_GPL(snd_soc_poweroff);
@@ -3767,6 +3790,16 @@ int snd_soc_register_card(struct snd_soc_card *card)
         if (ret != 0)
                 soc_cleanup_card_debugfs(card);
 
+        /* deactivate pins to sleep state */
+        for (i = 0; i < card->num_rtd; i++) {
+                struct snd_soc_dai *cpu_dai = card->rtd[i].cpu_dai;
+                struct snd_soc_dai *codec_dai = card->rtd[i].codec_dai;
+                if (!codec_dai->active)
+                        pinctrl_pm_select_sleep_state(codec_dai->dev);
+                if (!cpu_dai->active)
+                        pinctrl_pm_select_sleep_state(cpu_dai->dev);
+        }
+
         return ret;
 }
 EXPORT_SYMBOL_GPL(snd_soc_register_card);
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index cc36caaf6443..dcade130157f 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -1427,7 +1427,7 @@ static void dapm_seq_check_event(struct snd_soc_card *card,
                 power = 0;
                 break;
         default:
-                BUG();
+                WARN(1, "Unknown event %d\n", event);
                 return;
         }
 
@@ -1460,7 +1460,7 @@ static void dapm_seq_run_coalesced(struct snd_soc_card *card,
                                power_list)->reg;
 
         list_for_each_entry(w, pending, power_list) {
-                BUG_ON(reg != w->reg);
+                WARN_ON(reg != w->reg);
                 w->power = w->new_power;
 
                 mask |= w->mask << w->shift;
@@ -2026,7 +2026,7 @@ static ssize_t dapm_bias_read_file(struct file *file, char __user *user_buf,
                 level = "Off\n";
                 break;
         default:
-                BUG();
+                WARN(1, "Unknown bias_level %d\n", dapm->bias_level);
                 level = "Unknown\n";
                 break;
         }
@@ -3359,8 +3359,9 @@ static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w,
         u64 fmt;
         int ret;
 
-        BUG_ON(!config);
-        BUG_ON(list_empty(&w->sources) || list_empty(&w->sinks));
+        if (WARN_ON(!config) ||
+            WARN_ON(list_empty(&w->sources) || list_empty(&w->sinks)))
+                return -EINVAL;
 
         /* We only support a single source and sink, pick the first */
         source_p = list_first_entry(&w->sources, struct snd_soc_dapm_path,
@@ -3368,9 +3369,10 @@ static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w,
         sink_p = list_first_entry(&w->sinks, struct snd_soc_dapm_path,
                                   list_source);
 
-        BUG_ON(!source_p || !sink_p);
-        BUG_ON(!sink_p->source || !source_p->sink);
-        BUG_ON(!source_p->source || !sink_p->sink);
+        if (WARN_ON(!source_p || !sink_p) ||
+            WARN_ON(!sink_p->source || !source_p->sink) ||
+            WARN_ON(!source_p->source || !sink_p->sink))
+                return -EINVAL;
 
         source = source_p->source->priv;
         sink = sink_p->sink->priv;
@@ -3446,7 +3448,7 @@ static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w,
                 break;
 
         default:
-                BUG();
+                WARN(1, "Unknown event %d\n", event);
                 return -EINVAL;
         }
 
diff --git a/sound/soc/soc-generic-dmaengine-pcm.c b/sound/soc/soc-generic-dmaengine-pcm.c
index 51fded3640a5..cbc9c96ce1f4 100644
--- a/sound/soc/soc-generic-dmaengine-pcm.c
+++ b/sound/soc/soc-generic-dmaengine-pcm.c
@@ -90,6 +90,8 @@ static int dmaengine_pcm_hw_params(struct snd_pcm_substream *substream,
         struct dma_slave_config slave_config;
         int ret;
 
+        memset(&slave_config, 0, sizeof(slave_config));
+
         if (!pcm->config)
                 prepare_slave_config = snd_dmaengine_pcm_prepare_slave_config;
         else
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index 591f0f3074c5..42782c01e413 100644
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -19,6 +19,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/delay.h>
+#include <linux/pinctrl/consumer.h>
 #include <linux/pm_runtime.h>
 #include <linux/slab.h>
 #include <linux/workqueue.h>
@@ -183,6 +184,8 @@ static int soc_pcm_open(struct snd_pcm_substream *substream)
         struct snd_soc_dai_driver *codec_dai_drv = codec_dai->driver;
         int ret = 0;
 
+        pinctrl_pm_select_default_state(cpu_dai->dev);
+        pinctrl_pm_select_default_state(codec_dai->dev);
         pm_runtime_get_sync(cpu_dai->dev);
         pm_runtime_get_sync(codec_dai->dev);
         pm_runtime_get_sync(platform->dev);
@@ -317,6 +320,10 @@ out:
         pm_runtime_put(platform->dev);
         pm_runtime_put(codec_dai->dev);
         pm_runtime_put(cpu_dai->dev);
+        if (!codec_dai->active)
+                pinctrl_pm_select_sleep_state(codec_dai->dev);
+        if (!cpu_dai->active)
+                pinctrl_pm_select_sleep_state(cpu_dai->dev);
 
         return ret;
 }
@@ -426,6 +433,10 @@ static int soc_pcm_close(struct snd_pcm_substream *substream)
         pm_runtime_put(platform->dev);
         pm_runtime_put(codec_dai->dev);
         pm_runtime_put(cpu_dai->dev);
+        if (!codec_dai->active)
+                pinctrl_pm_select_sleep_state(codec_dai->dev);
+        if (!cpu_dai->active)
+                pinctrl_pm_select_sleep_state(cpu_dai->dev);
 
         return 0;
 }
diff --git a/sound/soc/txx9/txx9aclc.c b/sound/soc/txx9/txx9aclc.c
index 45a6428cba8d..fbd077f4de72 100644
--- a/sound/soc/txx9/txx9aclc.c
+++ b/sound/soc/txx9/txx9aclc.c
@@ -115,8 +115,8 @@ static void txx9aclc_dma_complete(void *arg)
         spin_lock_irqsave(&dmadata->dma_lock, flags);
         if (dmadata->frag_count >= 0) {
                 dmadata->dmacount--;
-                BUG_ON(dmadata->dmacount < 0);
-                tasklet_schedule(&dmadata->tasklet);
+                if (!WARN_ON(dmadata->dmacount < 0))
+                        tasklet_schedule(&dmadata->tasklet);
         }
         spin_unlock_irqrestore(&dmadata->dma_lock, flags);
 }
@@ -181,7 +181,10 @@ static void txx9aclc_dma_tasklet(unsigned long data)
                 spin_unlock_irqrestore(&dmadata->dma_lock, flags);
                 return;
         }
-        BUG_ON(dmadata->dmacount >= NR_DMA_CHAIN);
+        if (WARN_ON(dmadata->dmacount >= NR_DMA_CHAIN)) {
+                spin_unlock_irqrestore(&dmadata->dma_lock, flags);
+                return;
+        }
         while (dmadata->dmacount < NR_DMA_CHAIN) {
                 dmadata->dmacount++;
                 spin_unlock_irqrestore(&dmadata->dma_lock, flags);