summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-08-01 11:02:47 +0100
committerMark Brown <broonie@linaro.org>2013-08-01 12:01:29 +0100
commit2f6f0ffb2b073a0a5a9ffe5705b8e8cc43558d3a (patch)
tree3f47493f06c29088b5bd0fc124f487f9715ed04c /sound
parentd30c148bb1cab23d3c330e6352b8d882575a0c3a (diff)
downloadop-kernel-dev-2f6f0ffb2b073a0a5a9ffe5705b8e8cc43558d3a.zip
op-kernel-dev-2f6f0ffb2b073a0a5a9ffe5705b8e8cc43558d3a.tar.gz
ASoC: samsung: Make secondary I2S DAI device a child of primary
More for neatness than for any great utility. Really we shouldn't be creating the child device at all, refactoring will follow. Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/samsung/i2s.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c
index 9737358..849ac0e 100644
--- a/sound/soc/samsung/i2s.c
+++ b/sound/soc/samsung/i2s.c
@@ -1019,6 +1019,8 @@ static struct i2s_dai *i2s_alloc_dai(struct platform_device *pdev, bool sec)
if (IS_ERR(i2s->pdev))
return NULL;
+ i2s->pdev->dev.parent = &pdev->dev;
+
platform_set_drvdata(i2s->pdev, i2s);
ret = platform_device_add(i2s->pdev);
if (ret < 0)
OpenPOWER on IntegriCloud