Merge branch 'for-3.12' into for-next

1 files changed, 1 insertions, 3 deletions

diff --git a/sound/firewire/speakers.c b/sound/firewire/speakers.c
index 2c6386503940..fe9e6e2f2c5b 100644
--- a/sound/firewire/speakers.c
+++ b/sound/firewire/speakers.c
@@ -49,7 +49,6 @@ struct fwspk {
         struct snd_card *card;
         struct fw_unit *unit;
         const struct device_info *device_info;
-        struct snd_pcm_substream *pcm;
         struct mutex mutex;
         struct cmp_connection connection;
         struct amdtp_out_stream stream;
@@ -363,8 +362,7 @@ static int fwspk_create_pcm(struct fwspk *fwspk)
                 return err;
         pcm->private_data = fwspk;
         strcpy(pcm->name, fwspk->device_info->short_name);
-        fwspk->pcm = pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream;
-        fwspk->pcm->ops = &ops;
+        snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &ops);
         return 0;
 }