diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-23 14:30:41 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-23 14:30:41 +0000 |
| commit | d50a87402e29e16a63152be810d9723ce4d87e37 (patch) | |
| tree | 968932ec54cffd983b46bfb43d571c4d0d355561 | |
| parent | 5033f43c66754296dfb0ac5c895208e4a7f93aac (diff) | |
| parent | 24fb2b1174ddc1f844e2008eb5b3105832860395 (diff) | |
| download | linux-d50a87402e29e16a63152be810d9723ce4d87e37.tar.bz2 | |
Merge branch 'for-2.6.37' into for-2.6.38
| -rw-r--r-- | sound/soc/codecs/max98088.c | 3 | ||||
| -rw-r--r-- | sound/soc/codecs/tpa6130a2.c | 4 | ||||
| -rw-r--r-- | sound/soc/codecs/wm8904.c | 2 | ||||
| -rw-r--r-- | sound/soc/codecs/wm8994.c | 2 | ||||
| -rw-r--r-- | sound/soc/fsl/mpc5200_dma.c | 1 |
5 files changed, 10 insertions, 2 deletions
diff --git a/sound/soc/codecs/max98088.c b/sound/soc/codecs/max98088.c index c44b5f70b5e0..335a002aaf0e 100644 --- a/sound/soc/codecs/max98088.c +++ b/sound/soc/codecs/max98088.c @@ -2020,7 +2020,10 @@ err_access: static int max98088_remove(struct snd_soc_codec *codec) { + struct max98088_priv *max98088 = snd_soc_codec_get_drvdata(codec); + max98088_set_bias_level(codec, SND_SOC_BIAS_OFF); + kfree(max98088->eq_texts); return 0; } diff --git a/sound/soc/codecs/tpa6130a2.c b/sound/soc/codecs/tpa6130a2.c index bfef3da95f58..2d64502c0c5b 100644 --- a/sound/soc/codecs/tpa6130a2.c +++ b/sound/soc/codecs/tpa6130a2.c @@ -77,8 +77,10 @@ static int tpa6130a2_i2c_write(int reg, u8 value) if (data->power_state) { val = i2c_smbus_write_byte_data(tpa6130a2_client, reg, value); - if (val < 0) + if (val < 0) { dev_err(&tpa6130a2_client->dev, "Write failed\n"); + return val; + } } /* Either powered on or off, we save the context */ diff --git a/sound/soc/codecs/wm8904.c b/sound/soc/codecs/wm8904.c index da9192890187..d0024666eaf9 100644 --- a/sound/soc/codecs/wm8904.c +++ b/sound/soc/codecs/wm8904.c @@ -2498,6 +2498,8 @@ static int wm8904_remove(struct snd_soc_codec *codec) wm8904_set_bias_level(codec, SND_SOC_BIAS_OFF); regulator_bulk_free(ARRAY_SIZE(wm8904->supplies), wm8904->supplies); + kfree(wm8904->retune_mobile_texts); + kfree(wm8904->drc_texts); return 0; } diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index 63a3895b021a..283399468b0c 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c @@ -2503,6 +2503,8 @@ static int wm8994_codec_remove(struct snd_soc_codec *codec) wm8994_free_irq(codec->control_data, WM8994_IRQ_MIC2_DET, wm8994); wm8994_free_irq(codec->control_data, WM8994_IRQ_MIC1_SHRT, wm8994); wm8994_free_irq(codec->control_data, WM8994_IRQ_MIC1_DET, wm8994); + kfree(wm8994->retune_mobile_texts); + kfree(wm8994->drc_texts); kfree(wm8994); return 0; diff --git a/sound/soc/fsl/mpc5200_dma.c b/sound/soc/fsl/mpc5200_dma.c index dce6b551cd78..f92dca07cd35 100644 --- a/sound/soc/fsl/mpc5200_dma.c +++ b/sound/soc/fsl/mpc5200_dma.c @@ -9,7 +9,6 @@ #include <linux/module.h> #include <linux/of_device.h> #include <linux/slab.h> -#include <linux/of_device.h> #include <linux/of_platform.h> #include <sound/soc.h> |