Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d50a8740 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-2.6.37' into for-2.6.38

parents 5033f43c 24fb2b11

sound/soc/codecs/max98088.c

+3 −0
Original line number Diff line number Diff line
@@ -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;

}

sound/soc/codecs/tpa6130a2.c

+3 −1
Original line number Diff line number Diff line
@@ -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 */

sound/soc/codecs/wm8904.c

+2 −0
Original line number Diff line number Diff line
@@ -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;

}

sound/soc/codecs/wm8994.c

+2 −0
Original line number Diff line number Diff line
@@ -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;

sound/soc/fsl/mpc5200_dma.c

+0 −1
Original line number Diff line number Diff line
@@ -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>