projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'asoc/fix/rockchip' into asoc-linus
[linux-2.6-microblaze.git]
/
sound
/
soc
/
rockchip
/
rockchip_i2s.c
diff --git
a/sound/soc/rockchip/rockchip_i2s.c
b/sound/soc/rockchip/rockchip_i2s.c
index
a7972c2
..
908211e
100644
(file)
--- a/
sound/soc/rockchip/rockchip_i2s.c
+++ b/
sound/soc/rockchip/rockchip_i2s.c
@@
-579,10
+579,8
@@
static int rockchip_i2s_probe(struct platform_device *pdev)
int val;
i2s = devm_kzalloc(&pdev->dev, sizeof(*i2s), GFP_KERNEL);
- if (!i2s) {
- dev_err(&pdev->dev, "Can't allocate rk_i2s_dev\n");
+ if (!i2s)
return -ENOMEM;
- }
i2s->dev = &pdev->dev;