tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds a8062e42 1fd2a850

+8 -8
+2 -2
sound/soc/codecs/wm8753.c
··· 1454 1454 /* set the update bits */ 1455 1455 snd_soc_update_bits(codec, WM8753_LDAC, 0x0100, 0x0100); 1456 1456 snd_soc_update_bits(codec, WM8753_RDAC, 0x0100, 0x0100); 1457 - snd_soc_update_bits(codec, WM8753_LDAC, 0x0100, 0x0100); 1458 - snd_soc_update_bits(codec, WM8753_RDAC, 0x0100, 0x0100); 1457 + snd_soc_update_bits(codec, WM8753_LADC, 0x0100, 0x0100); 1458 + snd_soc_update_bits(codec, WM8753_RADC, 0x0100, 0x0100); 1459 1459 snd_soc_update_bits(codec, WM8753_LOUT1V, 0x0100, 0x0100); 1460 1460 snd_soc_update_bits(codec, WM8753_ROUT1V, 0x0100, 0x0100); 1461 1461 snd_soc_update_bits(codec, WM8753_LOUT2V, 0x0100, 0x0100);
+1 -1
sound/soc/omap/mcpdm.c
··· 449 449 return ret; 450 450 } 451 451 452 - int __devexit omap_mcpdm_remove(struct platform_device *pdev) 452 + int omap_mcpdm_remove(struct platform_device *pdev) 453 453 { 454 454 struct omap_mcpdm *mcpdm_ptr = platform_get_drvdata(pdev); 455 455
+1 -1
sound/soc/omap/mcpdm.h
··· 150 150 extern void omap_mcpdm_free(void); 151 151 extern int omap_mcpdm_set_offset(int offset1, int offset2); 152 152 int __devinit omap_mcpdm_probe(struct platform_device *pdev); 153 - int __devexit omap_mcpdm_remove(struct platform_device *pdev); 153 + int omap_mcpdm_remove(struct platform_device *pdev);
+4 -4
sound/soc/pxa/zylonite.c
··· 196 196 if (clk_pout) { 197 197 pout = clk_get(NULL, "CLK_POUT"); 198 198 if (IS_ERR(pout)) { 199 - dev_err(&pdev->dev, "Unable to obtain CLK_POUT: %ld\n", 199 + dev_err(card->dev, "Unable to obtain CLK_POUT: %ld\n", 200 200 PTR_ERR(pout)); 201 201 return PTR_ERR(pout); 202 202 } 203 203 204 204 ret = clk_enable(pout); 205 205 if (ret != 0) { 206 - dev_err(&pdev->dev, "Unable to enable CLK_POUT: %d\n", 206 + dev_err(card->dev, "Unable to enable CLK_POUT: %d\n", 207 207 ret); 208 208 clk_put(pout); 209 209 return ret; 210 210 } 211 211 212 - dev_dbg(&pdev->dev, "MCLK enabled at %luHz\n", 212 + dev_dbg(card->dev, "MCLK enabled at %luHz\n", 213 213 clk_get_rate(pout)); 214 214 } 215 215 ··· 241 241 if (clk_pout) { 242 242 ret = clk_enable(pout); 243 243 if (ret != 0) 244 - dev_err(&pdev->dev, "Unable to enable CLK_POUT: %d\n", 244 + dev_err(card->dev, "Unable to enable CLK_POUT: %d\n", 245 245 ret); 246 246 } 247 247