2 files changed, 3 insertions, 5 deletions

diff --git a/sound/firewire/amdtp.c b/sound/firewire/amdtp.c
index 5540f707bfdb..d3226892ad6b 100644
--- a/sound/firewire/amdtp.c
+++ b/sound/firewire/amdtp.c
@@ -296,7 +296,7 @@ static void amdtp_write_s32(struct amdtp_out_stream *s,
 
         channels = s->pcm_channels;
         src = (void *)runtime->dma_area +
-                        s->pcm_buffer_pointer * (runtime->frame_bits / 8);
+                        frames_to_bytes(runtime, s->pcm_buffer_pointer);
         remaining_frames = runtime->buffer_size - s->pcm_buffer_pointer;
         frame_step = s->data_block_quadlets - channels;
 
@@ -322,7 +322,7 @@ static void amdtp_write_s16(struct amdtp_out_stream *s,
 
         channels = s->pcm_channels;
         src = (void *)runtime->dma_area +
-                        s->pcm_buffer_pointer * (runtime->frame_bits / 8);
+                        frames_to_bytes(runtime, s->pcm_buffer_pointer);
         remaining_frames = runtime->buffer_size - s->pcm_buffer_pointer;
         frame_step = s->data_block_quadlets - channels;
 
diff --git a/sound/firewire/speakers.c b/sound/firewire/speakers.c
index eb3f7dce1d6c..cc8bc3a51bc1 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;
@@ -361,8 +360,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;
 }