OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c3a3d3c
)
ASoC: rockchip: Fix build
author
Mark Brown
<broonie@kernel.org>
Thu, 15 Jun 2017 19:13:33 +0000
(20:13 +0100)
committer
Mark Brown
<broonie@kernel.org>
Fri, 16 Jun 2017 11:11:24 +0000
(12:11 +0100)
Reported-by: Christophe Jaillet <christophe.jaillet@wanadoo.fr>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/rockchip/rockchip_i2s.c
patch
|
blob
|
history
diff --git
a/sound/soc/rockchip/rockchip_i2s.c
b/sound/soc/rockchip/rockchip_i2s.c
index
ce09dee
..
b4a8aff
100644
(file)
--- a/
sound/soc/rockchip/rockchip_i2s.c
+++ b/
sound/soc/rockchip/rockchip_i2s.c
@@
-641,10
+641,10
@@
static int rockchip_i2s_probe(struct platform_device *pdev)
goto err_pm_disable;
}
- soc_dai = devm_kmemdup(&pdev->dev, &rockchip_i2s_dai
+ soc_dai = devm_kmemdup(&pdev->dev, &rockchip_i2s_dai
,
sizeof(*soc_dai), GFP_KERNEL);
if (!soc_dai) {
-
err
= -ENOMEM;
+
ret
= -ENOMEM;
goto err_pm_disable;
}