diff --git a/[refs] b/[refs]
index a1a4b2df45e7..3d5301a8e4e0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 899a179dbf5878fd01c0bd3b0e884ec526916afb
+refs/heads/master: cb412a8da82233af001d13c28fc54f25a2001aef
diff --git a/trunk/drivers/staging/media/solo6x10/v4l2-enc.c b/trunk/drivers/staging/media/solo6x10/v4l2-enc.c
index f8f0da952288..4977e869d5b7 100644
--- a/trunk/drivers/staging/media/solo6x10/v4l2-enc.c
+++ b/trunk/drivers/staging/media/solo6x10/v4l2-enc.c
@@ -1619,6 +1619,8 @@ static int solo_s_ext_ctrls(struct file *file, void *priv,
 				solo_enc->osd_text[OSD_TEXT_MAX] = '\0';
 				if (!err)
 					err = solo_osd_print(solo_enc);
+				else
+					err = -EFAULT;
 			}
 			break;
 		default:
@@ -1654,6 +1656,8 @@ static int solo_g_ext_ctrls(struct file *file, void *priv,
 				err = copy_to_user(ctrl->string,
 						   solo_enc->osd_text,
 						   OSD_TEXT_MAX);
+				if (err)
+					err = -EFAULT;
 			}
 			break;
 		default: