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

Commit 649e5fb0 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-2.6.37' into for-2.6.38

parents df0701bb 39a54555

sound/soc/fsl/mpc8610_hpcd.c

+1 −0
Original line number Diff line number Diff line
@@ -498,6 +498,7 @@ static int mpc8610_hpcd_probe(struct platform_device *pdev) 
		dev_err(&pdev->dev, "platform device add failed\n");

		goto error;

	}

	dev_set_drvdata(&pdev->dev, sound_device);



	of_node_put(codec_np);

sound/soc/fsl/p1022_ds.c

+1 −0
Original line number Diff line number Diff line
@@ -498,6 +498,7 @@ static int p1022_ds_probe(struct platform_device *pdev) 
		dev_err(&pdev->dev, "platform device add failed\n");

		goto error;

	}

	dev_set_drvdata(&pdev->dev, sound_device);



	of_node_put(codec_np);

sound/soc/nuc900/nuc900-ac97.c

+7 −8
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ static unsigned short nuc900_ac97_read(struct snd_ac97 *ac97, 
	mutex_lock(&ac97_mutex);



	val = nuc900_checkready();

	if (!!val) {

	if (val) {

		dev_err(nuc900_audio->dev, "AC97 codec is not ready\n");

		goto out;

	}
@@ -102,7 +102,7 @@ static void nuc900_ac97_write(struct snd_ac97 *ac97, unsigned short reg, 
	mutex_lock(&ac97_mutex);



	tmp = nuc900_checkready();

	if (!!tmp)

	if (tmp)

		dev_err(nuc900_audio->dev, "AC97 codec is not ready\n");



	/* clear the R_WB bit and write register index */
@@ -149,7 +149,7 @@ static void nuc900_ac97_warm_reset(struct snd_ac97 *ac97) 
	udelay(100);



	val = nuc900_checkready();

	if (!!val)

	if (val)

		dev_err(nuc900_audio->dev, "AC97 codec is not ready\n");



	mutex_unlock(&ac97_mutex);
@@ -263,8 +263,7 @@ static int nuc900_ac97_trigger(struct snd_pcm_substream *substream, 
	return ret;

}



static int nuc900_ac97_probe(struct platform_device *pdev,

					struct snd_soc_dai *dai)

static int nuc900_ac97_probe(struct snd_soc_dai *dai)

{

	struct nuc900_audio *nuc900_audio = nuc900_ac97_data;

	unsigned long val;
@@ -284,12 +283,12 @@ static int nuc900_ac97_probe(struct platform_device *pdev, 
	return 0;

}



static void nuc900_ac97_remove(struct platform_device *pdev,

						struct snd_soc_dai *dai)

static int nuc900_ac97_remove(struct snd_soc_dai *dai)

{

	struct nuc900_audio *nuc900_audio = nuc900_ac97_data;



	clk_disable(nuc900_audio->clk);

	return 0;

}



static struct snd_soc_dai_ops nuc900_ac97_dai_ops = {
@@ -313,7 +312,7 @@ static struct snd_soc_dai_driver nuc900_ac97_dai = { 
		.channels_max	= 2,

	},

	.ops = &nuc900_ac97_dai_ops,

}

};



static int __devinit nuc900_ac97_drvprobe(struct platform_device *pdev)

{

sound/soc/nuc900/nuc900-audio.h

+2 −0
Original line number Diff line number Diff line
@@ -110,4 +110,6 @@ struct nuc900_audio { 


};



extern struct nuc900_audio *nuc900_ac97_data;



#endif /*end _NUC900_AUDIO_H */

sound/soc/nuc900/nuc900-pcm.c

+1 −1
Original line number Diff line number Diff line
@@ -332,7 +332,7 @@ static struct snd_soc_platform_driver nuc900_soc_platform = { 
	.ops		= &nuc900_dma_ops,

	.pcm_new	= nuc900_dma_new,

	.pcm_free	= nuc900_dma_free_dma_buffers,

}

};



static int __devinit nuc900_soc_platform_probe(struct platform_device *pdev)

{