ASoC: dwc: Remove check in set_bclk_ratio handling
authorPhil Elwell <phil@raspberrypi.com>
Mon, 20 Nov 2023 15:17:34 +0000 (15:17 +0000)
committerDom Cobley <popcornmix@gmail.com>
Mon, 19 Feb 2024 11:35:14 +0000 (11:35 +0000)
A check added to dw_i2s_set_bclk_ratio that the data format is
consistent with the ratio seems reasonable but breaks when the
ratio is changed before the format. Remove the check - it is
unnecessary.

See: https://github.com/raspberrypi/linux/issues/5724
Fixes: 9c6694c24f26 ("ASOC: dwc: Fix 16-bit audio handling")

Signed-off-by: Phil Elwell <phil@raspberrypi.com>
sound/soc/dwc/dwc-i2s.c

index 00425bd..9d6a12e 100644 (file)
@@ -528,11 +528,8 @@ static int dw_i2s_set_bclk_ratio(struct snd_soc_dai *cpu_dai,
                                 unsigned int ratio)
 {
        struct dw_i2s_dev *dev = snd_soc_dai_get_drvdata(cpu_dai);
-       struct i2s_clk_config_data *config = &dev->config;
 
        dev_dbg(dev->dev, "%s(%d)\n", __func__, ratio);
-       if (ratio < config->data_width * 2)
-               return -EINVAL;
 
        switch (ratio) {
        case 32: