Merge branch 'dice-driver-playback-only' of git://git.alsa-project.org/alsa-kprivate into for-next

1 files changed, 7 insertions, 9 deletions

diff --git a/sound/firewire/speakers.c b/sound/firewire/speakers.c
index fe9e6e2f2c5b..cc8bc3a51bc1 100644
--- a/sound/firewire/speakers.c
+++ b/sound/firewire/speakers.c
@@ -52,7 +52,6 @@ struct fwspk {
         struct mutex mutex;
         struct cmp_connection connection;
         struct amdtp_out_stream stream;
-        bool stream_running;
         bool mute;
         s16 volume[6];
         s16 volume_min;
@@ -188,10 +187,9 @@ static int fwspk_close(struct snd_pcm_substream *substream)
 
 static void fwspk_stop_stream(struct fwspk *fwspk)
 {
-        if (fwspk->stream_running) {
+        if (amdtp_out_stream_running(&fwspk->stream)) {
                 amdtp_out_stream_stop(&fwspk->stream);
                 cmp_connection_break(&fwspk->connection);
-                fwspk->stream_running = false;
         }
 }
 
@@ -246,8 +244,10 @@ static int fwspk_hw_params(struct snd_pcm_substream *substream,
         if (err < 0)
                 goto error;
 
-        amdtp_out_stream_set_rate(&fwspk->stream, params_rate(hw_params));
-        amdtp_out_stream_set_pcm(&fwspk->stream, params_channels(hw_params));
+        amdtp_out_stream_set_parameters(&fwspk->stream,
+                                        params_rate(hw_params),
+                                        params_channels(hw_params),
+                                        0);
 
         amdtp_out_stream_set_pcm_format(&fwspk->stream,
                                         params_format(hw_params));
@@ -285,7 +285,7 @@ static int fwspk_prepare(struct snd_pcm_substream *substream)
         if (amdtp_out_streaming_error(&fwspk->stream))
                 fwspk_stop_stream(fwspk);
 
-        if (!fwspk->stream_running) {
+        if (!amdtp_out_stream_running(&fwspk->stream)) {
                 err = cmp_connection_establish(&fwspk->connection,
                         amdtp_out_stream_get_max_payload(&fwspk->stream));
                 if (err < 0)
@@ -296,8 +296,6 @@ static int fwspk_prepare(struct snd_pcm_substream *substream)
                                         fwspk->connection.speed);
                 if (err < 0)
                         goto err_connection;
-
-                fwspk->stream_running = true;
         }
 
         mutex_unlock(&fwspk->mutex);
@@ -647,7 +645,7 @@ static u32 fwspk_read_firmware_version(struct fw_unit *unit)
         int err;
 
         err = snd_fw_transaction(unit, TCODE_READ_QUADLET_REQUEST,
-                                 OXFORD_FIRMWARE_ID_ADDRESS, &data, 4);
+                                 OXFORD_FIRMWARE_ID_ADDRESS, &data, 4, 0);
         return err >= 0 ? be32_to_cpu(data) : 0;
 }