Commit a8062e42 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fix/asoc' of git://github.com/tiwai/sound 

* 'fix/asoc' of git://github.com/tiwai/sound:
  ASoC: omap_mcpdm_remove cannot be __devexit
  ASoC: Fix setting update bits for WM8753_LADC and WM8753_RADC
  ASoC: use a valid device for dev_err() in Zylonite
parents 1fd2a850 b5c49d49

sound/soc/codecs/wm8753.c

+2 −2
Original line number Diff line number Diff line
@@ -1454,8 +1454,8 @@ static int wm8753_probe(struct snd_soc_codec *codec) 
	/* set the update bits */

	snd_soc_update_bits(codec, WM8753_LDAC, 0x0100, 0x0100);

	snd_soc_update_bits(codec, WM8753_RDAC, 0x0100, 0x0100);

	snd_soc_update_bits(codec, WM8753_LDAC, 0x0100, 0x0100);

	snd_soc_update_bits(codec, WM8753_RDAC, 0x0100, 0x0100);

	snd_soc_update_bits(codec, WM8753_LADC, 0x0100, 0x0100);

	snd_soc_update_bits(codec, WM8753_RADC, 0x0100, 0x0100);

	snd_soc_update_bits(codec, WM8753_LOUT1V, 0x0100, 0x0100);

	snd_soc_update_bits(codec, WM8753_ROUT1V, 0x0100, 0x0100);

	snd_soc_update_bits(codec, WM8753_LOUT2V, 0x0100, 0x0100);

sound/soc/omap/mcpdm.c

+1 −1
Original line number Diff line number Diff line
@@ -449,7 +449,7 @@ int __devinit omap_mcpdm_probe(struct platform_device *pdev) 
	return ret;

}



int __devexit omap_mcpdm_remove(struct platform_device *pdev)

int omap_mcpdm_remove(struct platform_device *pdev)

{

	struct omap_mcpdm *mcpdm_ptr = platform_get_drvdata(pdev);

sound/soc/omap/mcpdm.h

+1 −1
Original line number Diff line number Diff line
@@ -150,4 +150,4 @@ extern int omap_mcpdm_request(void); 
extern void omap_mcpdm_free(void);

extern int omap_mcpdm_set_offset(int offset1, int offset2);

int __devinit omap_mcpdm_probe(struct platform_device *pdev);

int __devexit omap_mcpdm_remove(struct platform_device *pdev);
 
int omap_mcpdm_remove(struct platform_device *pdev);

sound/soc/pxa/zylonite.c

+4 −4
Original line number Diff line number Diff line
@@ -196,20 +196,20 @@ static int zylonite_probe(struct snd_soc_card *card) 
	if (clk_pout) {

		pout = clk_get(NULL, "CLK_POUT");

		if (IS_ERR(pout)) {

			dev_err(&pdev->dev, "Unable to obtain CLK_POUT: %ld\n",

			dev_err(card->dev, "Unable to obtain CLK_POUT: %ld\n",

				PTR_ERR(pout));

			return PTR_ERR(pout);

		}



		ret = clk_enable(pout);

		if (ret != 0) {

			dev_err(&pdev->dev, "Unable to enable CLK_POUT: %d\n",

			dev_err(card->dev, "Unable to enable CLK_POUT: %d\n",

				ret);

			clk_put(pout);

			return ret;

		}



		dev_dbg(&pdev->dev, "MCLK enabled at %luHz\n",

		dev_dbg(card->dev, "MCLK enabled at %luHz\n",

			clk_get_rate(pout));

	}
@@ -241,7 +241,7 @@ static int zylonite_resume_pre(struct snd_soc_card *card) 
	if (clk_pout) {

		ret = clk_enable(pout);

		if (ret != 0)

			dev_err(&pdev->dev, "Unable to enable CLK_POUT: %d\n",

			dev_err(card->dev, "Unable to enable CLK_POUT: %d\n",

				ret);

	}