diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-24 11:24:12 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-24 11:24:12 +0100 |
| commit | 1f7f8e04629caf9b8fc1510faf243cc5bdb16c07 (patch) | |
| tree | 853b9a24d477998bfbcf7dfb582085d779c3d6ef /sound/soc/samsung/i2s.c | |
| parent | a6f849f75253c1f2353940a113e882c275ba5217 (diff) | |
| parent | de0022d4bf3a5acaef75cf1c7c2f8d71b020e8c9 (diff) | |
| download | linux-stable-1f7f8e04629caf9b8fc1510faf243cc5bdb16c07.tar.gz linux-stable-1f7f8e04629caf9b8fc1510faf243cc5bdb16c07.tar.bz2 linux-stable-1f7f8e04629caf9b8fc1510faf243cc5bdb16c07.zip | |
Merge remote-tracking branch 'asoc/topic/samsung' into asoc-next
Diffstat (limited to 'sound/soc/samsung/i2s.c')
| -rw-r--r-- | sound/soc/samsung/i2s.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c index 3e08b6c0f7ba..2c4d2505a19e 100644 --- a/sound/soc/samsung/i2s.c +++ b/sound/soc/samsung/i2s.c @@ -1055,7 +1055,7 @@ static struct i2s_dai *i2s_alloc_dai(struct platform_device *pdev, bool sec) i2s->i2s_dai_drv.ops = &samsung_i2s_dai_ops; i2s->i2s_dai_drv.suspend = i2s_suspend; i2s->i2s_dai_drv.resume = i2s_resume; - i2s->i2s_dai_drv.playback.channels_min = 2; + i2s->i2s_dai_drv.playback.channels_min = 1; i2s->i2s_dai_drv.playback.channels_max = 2; i2s->i2s_dai_drv.playback.rates = SAMSUNG_I2S_RATES; i2s->i2s_dai_drv.playback.formats = SAMSUNG_I2S_FMTS; @@ -1138,9 +1138,9 @@ static int samsung_i2s_probe(struct platform_device *pdev) dev_err(&pdev->dev, "Unable to get drvdata\n"); return -EFAULT; } - snd_soc_register_component(&sec_dai->pdev->dev, - &samsung_i2s_component, - &sec_dai->i2s_dai_drv, 1); + devm_snd_soc_register_component(&sec_dai->pdev->dev, + &samsung_i2s_component, + &sec_dai->i2s_dai_drv, 1); samsung_asoc_dma_platform_register(&pdev->dev); return 0; } @@ -1253,8 +1253,9 @@ static int samsung_i2s_probe(struct platform_device *pdev) goto err; } - snd_soc_register_component(&pri_dai->pdev->dev, &samsung_i2s_component, - &pri_dai->i2s_dai_drv, 1); + devm_snd_soc_register_component(&pri_dai->pdev->dev, + &samsung_i2s_component, + &pri_dai->i2s_dai_drv, 1); pm_runtime_enable(&pdev->dev); @@ -1289,7 +1290,6 @@ static int samsung_i2s_remove(struct platform_device *pdev) i2s->sec_dai = NULL; samsung_asoc_dma_platform_unregister(&pdev->dev); - snd_soc_unregister_component(&pdev->dev); return 0; } |