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

Commit 37fa84d8 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'fix/asoc' into for-linus

parents 5a8cfb4e 25436180

sound/soc/atmel/sam9g20_wm8731.c

+6 −3
Original line number Diff line number Diff line
@@ -222,9 +222,9 @@ static int __init at91sam9g20ek_init(void) 
	}



	pllb = clk_get(NULL, "pllb");

	if (IS_ERR(mclk)) {

	if (IS_ERR(pllb)) {

		printk(KERN_ERR "ASoC: Failed to get PLLB\n");

		ret = PTR_ERR(mclk);

		ret = PTR_ERR(pllb);

		goto err_mclk;

	}

	ret = clk_set_parent(mclk, pllb);
@@ -240,6 +240,7 @@ static int __init at91sam9g20ek_init(void) 
	if (!at91sam9g20ek_snd_device) {

		printk(KERN_ERR "ASoC: Platform device allocation failed\n");

		ret = -ENOMEM;

		goto err_mclk;

	}



	platform_set_drvdata(at91sam9g20ek_snd_device,
@@ -248,11 +249,13 @@ static int __init at91sam9g20ek_init(void) 
	ret = platform_device_add(at91sam9g20ek_snd_device);

	if (ret) {

		printk(KERN_ERR "ASoC: Platform device allocation failed\n");

		platform_device_put(at91sam9g20ek_snd_device);

		goto err_device_add;

	}



	return ret;



err_device_add:

	platform_device_put(at91sam9g20ek_snd_device);

err_mclk:

	clk_put(mclk);

	mclk = NULL;

sound/soc/atmel/snd-soc-afeb9260.c

+0 −1
Original line number Diff line number Diff line
@@ -167,7 +167,6 @@ static int __init afeb9260_soc_init(void) 


	return 0;

err1:

	platform_device_del(afeb9260_snd_device);

	platform_device_put(afeb9260_snd_device);

	return err;

}

sound/soc/codecs/max98088.c

+3 −0
Original line number Diff line number Diff line
@@ -2019,7 +2019,10 @@ static int max98088_probe(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);

       kfree(max98088->eq_texts);



       return 0;

}

sound/soc/codecs/stac9766.c

+1 −0
Original line number Diff line number Diff line
@@ -383,6 +383,7 @@ static struct snd_soc_codec_driver soc_codec_dev_stac9766 = { 
	.reg_cache_size = sizeof(stac9766_reg),

	.reg_word_size = sizeof(u16),

	.reg_cache_step = 2,

	.reg_cache_default = stac9766_reg,

};



static __devinit int stac9766_probe(struct platform_device *pdev)

sound/soc/codecs/tlv320aic3x.c

+3 −3
Original line number Diff line number Diff line
@@ -1176,7 +1176,7 @@ EXPORT_SYMBOL_GPL(aic3x_set_gpio); 
int aic3x_get_gpio(struct snd_soc_codec *codec, int gpio)

{

	u8 reg = gpio ? AIC3X_GPIO2_REG : AIC3X_GPIO1_REG;

	u8 val, bit = gpio ? 2: 1;

	u8 val = 0, bit = gpio ? 2 : 1;



	aic3x_read(codec, reg, &val);

	return (val >> bit) & 1;
@@ -1204,7 +1204,7 @@ EXPORT_SYMBOL_GPL(aic3x_set_headset_detection); 


int aic3x_headset_detected(struct snd_soc_codec *codec)

{

	u8 val;

	u8 val = 0;

	aic3x_read(codec, AIC3X_HEADSET_DETECT_CTRL_B, &val);

	return (val >> 4) & 1;

}
@@ -1212,7 +1212,7 @@ EXPORT_SYMBOL_GPL(aic3x_headset_detected); 


int aic3x_button_pressed(struct snd_soc_codec *codec)

{

	u8 val;

	u8 val = 0;

	aic3x_read(codec, AIC3X_HEADSET_DETECT_CTRL_B, &val);

	return (val >> 5) & 1;

}