From 7384774841ebda8688d5fc08994234379aba1a38 Mon Sep 17 00:00:00 2001
From: Alexandru Gheorghiu <gheorghiuandru@gmail.com>
Date: Mon, 25 Mar 2013 16:33:59 +0200
Subject: [PATCH] --- yaml --- r: 371875 b: refs/heads/master c:
 36300fd09823be8f7d6feaaa79ddbf54cf205378 h: refs/heads/master i:   371873:
 1125d552dfa3f853e51615688bfb007ddd464eca   371871:
 7a2a3e49995ec1c564f771f47c1f75d888d0f3c4 v: v3

---
 [refs]                   | 2 +-
 trunk/sound/soc/soc-io.c | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

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