summaryrefslogtreecommitdiffstats
path: root/sound/soc/sh/rcar/adg.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2018-10-04 07:52:58 +0200
committerTakashi Iwai <tiwai@suse.de>2018-10-04 07:53:06 +0200
commit4a9a72e0db5e584267944f4d868f46419b2fab59 (patch)
tree95e3b2f13e41cad37fdeff87ef5c1366bba39497 /sound/soc/sh/rcar/adg.c
parent2e75b676c3284930489a968d33b75e5d2b2c36c6 (diff)
parent709ae62e8e6d9ac4df7dadb3b8ae432675c45ef9 (diff)
downloadlinux-4a9a72e0db5e584267944f4d868f46419b2fab59.tar.bz2
Merge branch 'for-linus' into for-next
Back-merge 4.19-devel branch into 4.20 for applying FireWire patches cleanly. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/soc/sh/rcar/adg.c')
-rw-r--r--sound/soc/sh/rcar/adg.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/soc/sh/rcar/adg.c b/sound/soc/sh/rcar/adg.c
index 3a3064dda57f..051f96405346 100644
--- a/sound/soc/sh/rcar/adg.c
+++ b/sound/soc/sh/rcar/adg.c
@@ -462,6 +462,11 @@ static void rsnd_adg_get_clkout(struct rsnd_priv *priv,
goto rsnd_adg_get_clkout_end;
req_size = prop->length / sizeof(u32);
+ if (req_size > REQ_SIZE) {
+ dev_err(dev,
+ "too many clock-frequency, use top %d\n", REQ_SIZE);
+ req_size = REQ_SIZE;
+ }
of_property_read_u32_array(np, "clock-frequency", req_rate, req_size);
req_48kHz_rate = 0;