diff --git a/[refs] b/[refs]
index e76cabfaedbd..8227ef6f7fd1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e1328a832c7eeeb4dd3c3666605717c555de9e83
+refs/heads/master: 36300fd09823be8f7d6feaaa79ddbf54cf205378
diff --git a/trunk/sound/soc/soc-io.c b/trunk/sound/soc/soc-io.c
index 29183ef2b93d..8ca9ecc5ac57 100644
--- a/trunk/sound/soc/soc-io.c
+++ b/trunk/sound/soc/soc-io.c
@@ -158,10 +158,7 @@ int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec,
 		return -EINVAL;
 	}
 
-	if (IS_ERR(codec->control_data))
-		return PTR_ERR(codec->control_data);
-
-	return 0;
+	return PTR_RET(codec->control_data);
 }
 EXPORT_SYMBOL_GPL(snd_soc_codec_set_cache_io);
 #else