Merge branch 'topic/snd-device' into for-next

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;
         }