diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-02-03 19:57:16 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-02-03 19:57:16 +0300 |
| commit | 3fe9cf390f6dc84f76b112b0a660967a84f9a81b (patch) | |
| tree | 18b8573687ae8131db155aa791f4d2357d91e6c5 /sound/aoa/soundbus | |
| parent | 6ccd93bdb989507717edb375d40534f1177822c5 (diff) | |
| parent | 830953c0724b42be30a74febcde6c89c706ed286 (diff) | |
| download | linux-3fe9cf390f6dc84f76b112b0a660967a84f9a81b.tar.xz | |
Merge branch 'topic/snd-device' into for-next
Diffstat (limited to 'sound/aoa/soundbus')
| -rw-r--r-- | sound/aoa/soundbus/i2sbus/pcm.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/aoa/soundbus/i2sbus/pcm.c b/sound/aoa/soundbus/i2sbus/pcm.c index 4177d9729d0b..053b09c79053 100644 --- a/sound/aoa/soundbus/i2sbus/pcm.c +++ b/sound/aoa/soundbus/i2sbus/pcm.c @@ -968,7 +968,6 @@ i2sbus_attach_codec(struct soundbus_dev *dev, struct snd_card *card, printk(KERN_DEBUG "i2sbus: failed to create pcm\n"); goto out_put_ci_module; } - dev->pcm->dev = &dev->ofdev.dev; } /* ALSA yet again sucks. @@ -988,6 +987,8 @@ i2sbus_attach_codec(struct soundbus_dev *dev, struct snd_card *card, goto out_put_ci_module; snd_pcm_set_ops(dev->pcm, SNDRV_PCM_STREAM_PLAYBACK, &i2sbus_playback_ops); + dev->pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].dev.parent = + &dev->ofdev.dev; i2sdev->out.created = 1; } @@ -1003,6 +1004,8 @@ i2sbus_attach_codec(struct soundbus_dev *dev, struct snd_card *card, goto out_put_ci_module; snd_pcm_set_ops(dev->pcm, SNDRV_PCM_STREAM_CAPTURE, &i2sbus_record_ops); + dev->pcm->streams[SNDRV_PCM_STREAM_CAPTURE].dev.parent = + &dev->ofdev.dev; i2sdev->in.created = 1; } |