diff options
| author | Mark Brown <broonie@linaro.org> | 2013-11-15 05:20:08 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-15 05:20:08 -0500 |
| commit | 514918f0d1c3e7cf78fe2acbe80f7b616065e210 (patch) | |
| tree | f6a918d115acf0347ee69b2b90aada657a68ef96 /sound/soc/samsung/i2s.c | |
| parent | 9450d92c8c647752586eeeb7927da8a50a691c96 (diff) | |
| parent | fc7dc61d9a87011aaf8a6eb3144ebf9552adf5d2 (diff) | |
Merge remote-tracking branch 'asoc/fix/fsl' into asoc-linus
Diffstat (limited to 'sound/soc/samsung/i2s.c')
| -rw-r--r-- | sound/soc/samsung/i2s.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c index 2c4d2505a19e..a5cbdb4f1655 100644 --- 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) | |||
| 1068 | dev_set_drvdata(&i2s->pdev->dev, i2s); | 1068 | dev_set_drvdata(&i2s->pdev->dev, i2s); |
| 1069 | } else { /* Create a new platform_device for Secondary */ | 1069 | } else { /* Create a new platform_device for Secondary */ |
| 1070 | i2s->pdev = platform_device_alloc("samsung-i2s-sec", -1); | 1070 | i2s->pdev = platform_device_alloc("samsung-i2s-sec", -1); |
| 1071 | if (IS_ERR(i2s->pdev)) | 1071 | if (!i2s->pdev) |
| 1072 | return NULL; | 1072 | return NULL; |
| 1073 | 1073 | ||
| 1074 | i2s->pdev->dev.parent = &pdev->dev; | 1074 | i2s->pdev->dev.parent = &pdev->dev; |