diff --git a/[refs] b/[refs]
index e39a76aa808e..7c4daf7b4ab8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c7e62defd3c4a015b1f80a642bc320b9f9f3896c
+refs/heads/master: 6a4ca0399255260bb04fa4e718625ede0c745e59
diff --git a/trunk/drivers/staging/solo6x10/solo6010-g723.c b/trunk/drivers/staging/solo6x10/solo6010-g723.c
index e82846c1d6c6..82fbcb845878 100644
--- a/trunk/drivers/staging/solo6x10/solo6010-g723.c
+++ b/trunk/drivers/staging/solo6x10/solo6010-g723.c
@@ -233,7 +233,7 @@ static int snd_solo_pcm_copy(struct snd_pcm_substream *ss, int channel,
 				   solo_pcm->g723_buf, G723_PERIOD_BYTES);
 
 		if (err)
-			return err; 
+			return -EFAULT;
 	}
 
 	return 0;