korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-18 01:34:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'for-3.1' into for-3.2

Browse Source
This commit is contained in:
Mark Brown 2011-09-16 00:54:25 +01:00
commit cc2115cbfc
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sound/soc/blackfin/bf5xx-ad73311.c
View File

@ -128,7 +128,7 @@ static int snd_ad73311_configure(void)
return 0; return 0;
} }
static int bf5xx_probe(struct platform_device *pdev) static int bf5xx_probe(struct snd_soc_card *card)
{ {
int err; int err;
if (gpio_request(GPIO_SE, "AD73311_SE")) { if (gpio_request(GPIO_SE, "AD73311_SE")) {

2
sound/soc/kirkwood/kirkwood-i2s.c
View File

@ -424,7 +424,7 @@ static __devinit int kirkwood_i2s_dev_probe(struct platform_device *pdev)
if (!priv->mem) { if (!priv->mem) {
dev_err(&pdev->dev, "request_mem_region failed\n"); dev_err(&pdev->dev, "request_mem_region failed\n");
err = -EBUSY; err = -EBUSY;
goto error_alloc; goto err_alloc;
} }
priv->io = ioremap(priv->mem->start, SZ_16K); priv->io = ioremap(priv->mem->start, SZ_16K);