1 files changed, 5 insertions, 2 deletions

diff --git a/sound/soc/sh/rcar/cmd.c b/sound/soc/sh/rcar/cmd.c
index d879c010cf03..f1d4fb566892 100644
--- a/sound/soc/sh/rcar/cmd.c
+++ b/sound/soc/sh/rcar/cmd.c
@@ -31,7 +31,7 @@ static int rsnd_cmd_init(struct rsnd_mod *mod,
         struct rsnd_mod *mix = rsnd_io_to_mod_mix(io);
         struct device *dev = rsnd_priv_to_dev(priv);
         u32 data;
-        u32 path[] = {
+        static const u32 path[] = {
                 [1] = 1 << 0,
                 [5] = 1 << 8,
                 [6] = 1 << 12,
@@ -71,7 +71,7 @@ static int rsnd_cmd_init(struct rsnd_mod *mod,
         } else {
                 struct rsnd_mod *src = rsnd_io_to_mod_src(io);
 
-                u8 cmd_case[] = {
+                static const u8 cmd_case[] = {
                         [0] = 0x3,
                         [1] = 0x3,
                         [2] = 0x4,
@@ -82,6 +82,9 @@ static int rsnd_cmd_init(struct rsnd_mod *mod,
                         [9] = 0x2,
                 };
 
+                if (unlikely(!src))
+                        return -EIO;
+
                 data = path[rsnd_mod_id(src)] |
                         cmd_case[rsnd_mod_id(src)] << 16;
         }