lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'for-2.6.37' into for-2.6.38

Browse Source
This commit is contained in:
Mark Brown
2010-11-23 14:30:41 +00:00
parent 5033f43c66 24fb2b1174
commit d50a87402e
5 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sound/soc/codecs/max98088.c
View File

@@ -2020,7 +2020,10 @@ err_access:
static int max98088_remove(struct snd_soc_codec *codec) 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); max98088_set_bias_level(codec, SND_SOC_BIAS_OFF);
kfree(max98088->eq_texts);
return 0; return 0;
} }

4
sound/soc/codecs/tpa6130a2.c
View File

@@ -77,8 +77,10 @@ static int tpa6130a2_i2c_write(int reg, u8 value)
if (data->power_state) { if (data->power_state) {
val = i2c_smbus_write_byte_data(tpa6130a2_client, reg, value); val = i2c_smbus_write_byte_data(tpa6130a2_client, reg, value);
if (val < 0) if (val < 0) {
dev_err(&tpa6130a2_client->dev, "Write failed\n"); dev_err(&tpa6130a2_client->dev, "Write failed\n");
return val;
}
} }
/* Either powered on or off, we save the context */ /* Either powered on or off, we save the context */

2
sound/soc/codecs/wm8904.c
View File

@@ -2498,6 +2498,8 @@ static int wm8904_remove(struct snd_soc_codec *codec)
wm8904_set_bias_level(codec, SND_SOC_BIAS_OFF); wm8904_set_bias_level(codec, SND_SOC_BIAS_OFF);
regulator_bulk_free(ARRAY_SIZE(wm8904->supplies), wm8904->supplies); regulator_bulk_free(ARRAY_SIZE(wm8904->supplies), wm8904->supplies);
kfree(wm8904->retune_mobile_texts);
kfree(wm8904->drc_texts);
return 0; return 0;
} }

2
sound/soc/codecs/wm8994.c
View File

@@ -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_MIC2_DET, wm8994);
wm8994_free_irq(codec->control_data, WM8994_IRQ_MIC1_SHRT, wm8994); wm8994_free_irq(codec->control_data, WM8994_IRQ_MIC1_SHRT, wm8994);
wm8994_free_irq(codec->control_data, WM8994_IRQ_MIC1_DET, wm8994); wm8994_free_irq(codec->control_data, WM8994_IRQ_MIC1_DET, wm8994);
kfree(wm8994->retune_mobile_texts);
kfree(wm8994->drc_texts);
kfree(wm8994); kfree(wm8994);
return 0; return 0;

1
sound/soc/fsl/mpc5200_dma.c
View File

@@ -9,7 +9,6 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/of_device.h> #include <linux/of_device.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/of_device.h>
#include <linux/of_platform.h> #include <linux/of_platform.h>
#include <sound/soc.h> #include <sound/soc.h>