projects
/
platform
/
kernel
/
linux-arm64.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
4cf9159
)
Merge remote-tracking branch 'asoc/topic/samsung' into asoc-next
author
Mark Brown
<broonie@linaro.org>
Mon, 4 Nov 2013 06:04:20 +0000
(22:04 -0800)
committer
Mark Brown
<broonie@linaro.org>
Mon, 4 Nov 2013 06:04:20 +0000
(22:04 -0800)
sound/soc/samsung/i2s.c
patch
|
blob
|
history
diff --git
a/sound/soc/samsung/i2s.c
b/sound/soc/samsung/i2s.c
index 2c4d2505a19e3cce79a36bcb9b52d31df9df067d..a5cbdb4f1655d8213a778159c34a0fb0321b2b77 100644
(file)
--- a/
sound/soc/samsung/i2s.c
+++ b/
sound/soc/samsung/i2s.c
@@
-1068,7
+1068,7
@@
static struct i2s_dai *i2s_alloc_dai(struct platform_device *pdev, bool sec)
dev_set_drvdata(&i2s->pdev->dev, i2s);
} else { /* Create a new platform_device for Secondary */
i2s->pdev = platform_device_alloc("samsung-i2s-sec", -1);
- if (
IS_ERR(i2s->pdev)
)
+ if (
!i2s->pdev
)
return NULL;
i2s->pdev->dev.parent = &pdev->dev;