ASoC: io: Don't dereference regmap if we failed to get one

Avoids a crash in invalid configurations.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>

diff --git a/sound/soc/soc-io.c b/sound/soc/soc-io.c
index 44d0174b4d97d1a0e727fb3d606ea68be4e59740..29183ef2b93d2b950243149c6ffa1abcb56be69e 100644 (file)
--- a/sound/soc/soc-io.c
+++ b/sound/soc/soc-io.c
@@ -145,10 +145,13 @@ int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec,
                if (!codec->control_data)
                        codec->control_data = dev_get_regmap(codec->dev, NULL);
 
-               ret = regmap_get_val_bytes(codec->control_data);
-               /* Errors are legitimate for non-integer byte multiples */
-               if (ret > 0)
-                       codec->val_bytes = ret;
+               if (codec->control_data) {
+                       ret = regmap_get_val_bytes(codec->control_data);
+                       /* Errors are legitimate for non-integer byte
+                        * multiples */
+                       if (ret > 0)
+                               codec->val_bytes = ret;
+               }
                break;
 
        default: