ALSA: bebob: cancel switching connection order
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>
Mon, 24 May 2021 03:13:45 +0000 (12:13 +0900)
committerTakashi Iwai <tiwai@suse.de>
Tue, 25 May 2021 06:54:24 +0000 (08:54 +0200)
The order to establish connection seems to be meaningless.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Link: https://lore.kernel.org/r/20210524031346.50539-4-o-takashi@sakamocchi.jp
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/firewire/bebob/bebob_stream.c

index df76417..975670a 100644 (file)
@@ -623,7 +623,6 @@ int snd_bebob_stream_start_duplex(struct snd_bebob *bebob)
 
        if (!amdtp_stream_running(&bebob->rx_stream)) {
                enum snd_bebob_clock_type src;
-               struct amdtp_stream *master, *slave;
                unsigned int curr_rate;
                unsigned int tx_init_skip_cycles;
 
@@ -637,19 +636,11 @@ int snd_bebob_stream_start_duplex(struct snd_bebob *bebob)
                if (err < 0)
                        return err;
 
-               if (src != SND_BEBOB_CLOCK_TYPE_SYT) {
-                       master = &bebob->tx_stream;
-                       slave = &bebob->rx_stream;
-               } else {
-                       master = &bebob->rx_stream;
-                       slave = &bebob->tx_stream;
-               }
-
-               err = start_stream(bebob, master);
+               err = start_stream(bebob, &bebob->rx_stream);
                if (err < 0)
                        goto error;
 
-               err = start_stream(bebob, slave);
+               err = start_stream(bebob, &bebob->tx_stream);
                if (err < 0)
                        goto error;