Commit 6aa63a25 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/omap', 'asoc/topic/oom' and... 

Merge remote-tracking branches 'asoc/topic/omap', 'asoc/topic/oom' and 'asoc/topic/pxa' into asoc-next
parents a6ce3052 9cb0fe9b ba546687 45487289

sound/arm/pxa2xx-ac97-lib.c

+6 −6
Original line number Diff line number Diff line
@@ -152,9 +152,9 @@ static inline void pxa_ac97_cold_pxa27x(void) 
	gsr_bits = 0;



	/* PXA27x Developers Manual section 13.5.2.2.1 */

	clk_enable(ac97conf_clk);

	clk_prepare_enable(ac97conf_clk);

	udelay(5);

	clk_disable(ac97conf_clk);

	clk_disable_unprepare(ac97conf_clk);

	GCR = GCR_COLD_RST | GCR_WARM_RST;

}

#endif
@@ -299,14 +299,14 @@ static irqreturn_t pxa2xx_ac97_irq(int irq, void *dev_id) 
int pxa2xx_ac97_hw_suspend(void)

{

	GCR |= GCR_ACLINK_OFF;

	clk_disable(ac97_clk);

	clk_disable_unprepare(ac97_clk);

	return 0;

}

EXPORT_SYMBOL_GPL(pxa2xx_ac97_hw_suspend);



int pxa2xx_ac97_hw_resume(void)

{

	clk_enable(ac97_clk);

	clk_prepare_enable(ac97_clk);

	return 0;

}

EXPORT_SYMBOL_GPL(pxa2xx_ac97_hw_resume);
@@ -368,7 +368,7 @@ int pxa2xx_ac97_hw_probe(struct platform_device *dev) 
		goto err_clk;

	}



	ret = clk_enable(ac97_clk);

	ret = clk_prepare_enable(ac97_clk);

	if (ret)

		goto err_clk2;
@@ -403,7 +403,7 @@ void pxa2xx_ac97_hw_remove(struct platform_device *dev) 
		clk_put(ac97conf_clk);

		ac97conf_clk = NULL;

	}

	clk_disable(ac97_clk);

	clk_disable_unprepare(ac97_clk);

	clk_put(ac97_clk);

	ac97_clk = NULL;

}

sound/soc/codecs/cs4270.c

+1 −3
Original line number Diff line number Diff line
@@ -664,10 +664,8 @@ static int cs4270_i2c_probe(struct i2c_client *i2c_client, 


	cs4270 = devm_kzalloc(&i2c_client->dev, sizeof(struct cs4270_private),

			      GFP_KERNEL);

	if (!cs4270) {

		dev_err(&i2c_client->dev, "could not allocate codec\n");

	if (!cs4270)

		return -ENOMEM;

	}



	/* get the power supply regulators */

	for (i = 0; i < ARRAY_SIZE(supply_names); i++)

sound/soc/codecs/cs42l73.c

+1 −3
Original line number Diff line number Diff line
@@ -1408,10 +1408,8 @@ static int cs42l73_i2c_probe(struct i2c_client *i2c_client, 


	cs42l73 = devm_kzalloc(&i2c_client->dev, sizeof(struct cs42l73_private),

			       GFP_KERNEL);

	if (!cs42l73) {

		dev_err(&i2c_client->dev, "could not allocate codec\n");

	if (!cs42l73)

		return -ENOMEM;

	}



	cs42l73->regmap = devm_regmap_init_i2c(i2c_client, &cs42l73_regmap);

	if (IS_ERR(cs42l73->regmap)) {

sound/soc/codecs/sgtl5000.c

+1 −3
Original line number Diff line number Diff line
@@ -843,10 +843,8 @@ static int ldo_regulator_register(struct snd_soc_codec *codec, 


	ldo = kzalloc(sizeof(struct ldo_regulator), GFP_KERNEL);



	if (!ldo) {

		dev_err(codec->dev, "failed to allocate ldo_regulator\n");

	if (!ldo)

		return -ENOMEM;

	}



	ldo->desc.name = kstrdup(dev_name(codec->dev), GFP_KERNEL);

	if (!ldo->desc.name) {

sound/soc/codecs/sta529.c

+1 −3
Original line number Diff line number Diff line
@@ -380,10 +380,8 @@ static int sta529_i2c_probe(struct i2c_client *i2c, 
		return -EINVAL;



	sta529 = devm_kzalloc(&i2c->dev, sizeof(struct sta529), GFP_KERNEL);

	if (sta529 == NULL) {

		dev_err(&i2c->dev, "Can not allocate memory\n");

	if (!sta529)

		return -ENOMEM;

	}



	sta529->regmap = devm_regmap_init_i2c(i2c, &sta529_regmap);

	if (IS_ERR(sta529->regmap)) {