diff options
| author | Mark Brown <broonie@linaro.org> | 2013-11-04 01:04:20 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-04 01:04:20 -0500 |
| commit | d09223279370bf97a15d0bfd875632da19bd5ef3 (patch) | |
| tree | a6c5cf46f724cd5dd20ec11dd6f23b8237a8b1b3 | |
| parent | 4cf9159e2ae7d3a91f63b94c6dc7cb8ce3bfd257 (diff) | |
| parent | 29ca9c73e54131c9ad90c5381f368d9b09b5aca4 (diff) | |
Merge remote-tracking branch 'asoc/topic/samsung' into asoc-next
| -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; |