projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branches 'asoc/topic/tas571x', 'asoc/topic/tlv320aic31xx',...
[cascardo/linux.git]
/
sound
/
soc
/
samsung
/
s3c24xx-i2s.c
diff --git
a/sound/soc/samsung/s3c24xx-i2s.c
b/sound/soc/samsung/s3c24xx-i2s.c
index
b3a475d
..
3e76f2a
100644
(file)
--- a/
sound/soc/samsung/s3c24xx-i2s.c
+++ b/
sound/soc/samsung/s3c24xx-i2s.c
@@
-482,7
+482,8
@@
static int s3c24xx_iis_dev_probe(struct platform_device *pdev)
}
ret = samsung_asoc_dma_platform_register(&pdev->dev,
- pdata->dma_filter);
+ pdata->dma_filter,
+ NULL, NULL);
if (ret)
pr_err("failed to register the dma: %d\n", ret);