---

yaml --- r: 316263 b: refs/heads/master c: 9dfdd5a h: refs/heads/master i: 316261: 1e3f678 316259: 8e9870e 316255: 41c3b3f v: v3
git-mirror · Jun 23, 2012 · 59b0e56 · 59b0e56
1 parent 7195396
commit 59b0e56
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 62d4a4b99dfd647ef88b8434334eaa7497602857
+refs/heads/master: 9dfdd5abcf2b350d4fdb207c0dff3194e2fd73db
diff --git a/trunk/sound/soc/soc-io.c b/trunk/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: