Merge tag 'sound-fix-4.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

Pull sound fixes from Takashi Iwai:
 "A few device-specific fixes: a fix for SPDIF on old Creative PCI
  board, and two additional fixes for the recent changes in FireWire
  audio stack"

* tag 'sound-fix-4.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: firewire-lib: fix insufficient PCM rule for period/buffer size
  ALSA: ca0106: Disable IZD on SB0570 DAC to fix audio pops
  ALSA: dice: fix to wait for releases of all ALSA character devices

3 files changed, 12 insertions, 51 deletions

diff --git a/sound/firewire/amdtp-stream.c b/sound/firewire/amdtp-stream.c
index fcd965f1d69e..9be76c808fcc 100644
--- a/sound/firewire/amdtp-stream.c
+++ b/sound/firewire/amdtp-stream.c
@@ -146,53 +146,22 @@ static int apply_constraint_to_size(struct snd_pcm_hw_params *params,
         struct snd_interval *s = hw_param_interval(params, rule->var);
         const struct snd_interval *r =
                 hw_param_interval_c(params, SNDRV_PCM_HW_PARAM_RATE);
-        struct snd_interval t = {
-                .min = s->min, .max = s->max, .integer = 1,
-        };
+        struct snd_interval t = {0};
+        unsigned int step = 0;
         int i;
 
         for (i = 0; i < CIP_SFC_COUNT; ++i) {
-                unsigned int rate = amdtp_rate_table[i];
-                unsigned int step = amdtp_syt_intervals[i];
-
-                if (!snd_interval_test(r, rate))
-                        continue;
-
-                t.min = roundup(t.min, step);
-                t.max = rounddown(t.max, step);
+                if (snd_interval_test(r, amdtp_rate_table[i]))
+                        step = max(step, amdtp_syt_intervals[i]);
         }
 
-        if (snd_interval_checkempty(&t))
-                return -EINVAL;
+        t.min = roundup(s->min, step);
+        t.max = rounddown(s->max, step);
+        t.integer = 1;
 
         return snd_interval_refine(s, &t);
 }
 
-static int apply_constraint_to_rate(struct snd_pcm_hw_params *params,
-                                    struct snd_pcm_hw_rule *rule)
-{
-        struct snd_interval *r =
-                        hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE);
-        const struct snd_interval *s = hw_param_interval_c(params, rule->deps[0]);
-        struct snd_interval t = {
-                .min = UINT_MAX, .max = 0, .integer = 1,
-        };
-        int i;
-
-        for (i = 0; i < CIP_SFC_COUNT; ++i) {
-                unsigned int step = amdtp_syt_intervals[i];
-                unsigned int rate = amdtp_rate_table[i];
-
-                if (s->min % step || s->max % step)
-                        continue;
-
-                t.min = min(t.min, rate);
-                t.max = max(t.max, rate);
-        }
-
-        return snd_interval_refine(r, &t);
-}
-
 /**
  * amdtp_stream_add_pcm_hw_constraints - add hw constraints for PCM substream
  * @s:          the AMDTP stream, which must be initialized.
@@ -250,24 +219,16 @@ int amdtp_stream_add_pcm_hw_constraints(struct amdtp_stream *s,
          */
         err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_SIZE,
                                   apply_constraint_to_size, NULL,
+                                  SNDRV_PCM_HW_PARAM_PERIOD_SIZE,
                                   SNDRV_PCM_HW_PARAM_RATE, -1);
         if (err < 0)
                 goto end;
-        err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_RATE,
-                                  apply_constraint_to_rate, NULL,
-                                  SNDRV_PCM_HW_PARAM_PERIOD_SIZE, -1);
-        if (err < 0)
-                goto end;
         err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_BUFFER_SIZE,
                                   apply_constraint_to_size, NULL,
+                                  SNDRV_PCM_HW_PARAM_BUFFER_SIZE,
                                   SNDRV_PCM_HW_PARAM_RATE, -1);
         if (err < 0)
                 goto end;
-        err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_RATE,
-                                  apply_constraint_to_rate, NULL,
-                                  SNDRV_PCM_HW_PARAM_BUFFER_SIZE, -1);
-        if (err < 0)
-                goto end;
 end:
         return err;
 }
diff --git a/sound/firewire/dice/dice.c b/sound/firewire/dice/dice.c
index 0f6dbcffe711..ed50b222d36e 100644
--- a/sound/firewire/dice/dice.c
+++ b/sound/firewire/dice/dice.c
@@ -240,8 +240,8 @@ static void dice_remove(struct fw_unit *unit)
         cancel_delayed_work_sync(&dice->dwork);
 
         if (dice->registered) {
-                /* No need to wait for releasing card object in this context. */
-                snd_card_free_when_closed(dice->card);
+                // Block till all of ALSA character devices are released.
+                snd_card_free(dice->card);
         }
 
         mutex_destroy(&dice->mutex);
diff --git a/sound/pci/ca0106/ca0106.h b/sound/pci/ca0106/ca0106.h
index 04402c14cb23..9847b669cf3c 100644
--- a/sound/pci/ca0106/ca0106.h
+++ b/sound/pci/ca0106/ca0106.h
@@ -582,7 +582,7 @@
 #define SPI_PL_BIT_R_R          (2<<7)  /* right channel = right */
 #define SPI_PL_BIT_R_C          (3<<7)  /* right channel = (L+R)/2 */
 #define SPI_IZD_REG             2
-#define SPI_IZD_BIT             (1<<4)  /* infinite zero detect */
+#define SPI_IZD_BIT             (0<<4)  /* infinite zero detect */
 
 #define SPI_FMT_REG             3
 #define SPI_FMT_BIT_RJ          (0<<0)  /* right justified mode */