diff options
| author | Takashi Iwai <tiwai@suse.de> | 2023-03-03 14:20:56 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2023-03-03 14:20:56 +0100 |
| commit | 26ed1d29fc44f3f2f0c396c1392abefac5f0454e (patch) | |
| tree | ffba9ebddf759f04cbeca8adace5cc8093c58c2d /sound/soc/sh/rcar/ssi.c | |
| parent | e97fc9cffbb9f372b53b42c36cd7b20aab44a554 (diff) | |
| parent | 7933b90b42896f5b6596e6a829bb31c5121fc2a9 (diff) | |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'sound/soc/sh/rcar/ssi.c')
| -rw-r--r-- | sound/soc/sh/rcar/ssi.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c index 7ade6c5ed96f..8ddee5b03ece 100644 --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c @@ -303,15 +303,14 @@ static int rsnd_ssi_master_clk_start(struct rsnd_mod *mod, return 0; } + ret = -EIO; main_rate = rsnd_ssi_clk_query(rdai, rate, chan, &idx); - if (!main_rate) { - dev_err(dev, "unsupported clock rate\n"); - return -EIO; - } + if (!main_rate) + goto rate_err; ret = rsnd_adg_ssi_clk_try_start(mod, main_rate); if (ret < 0) - return ret; + goto rate_err; /* * SSI clock will be output contiguously @@ -333,6 +332,10 @@ static int rsnd_ssi_master_clk_start(struct rsnd_mod *mod, rsnd_mod_name(mod), chan, rate); return 0; + +rate_err: + dev_err(dev, "unsupported clock rate\n"); + return ret; } static void rsnd_ssi_master_clk_stop(struct rsnd_mod *mod, |