diff --git a/[refs] b/[refs]
index cb4018a55dea..0051a92a47a3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c2668c082ac1b4f30b145762a75ec2b3e016b952
+refs/heads/master: 7d0ee461fd173fea8ca254924263f189a3f0dc08
diff --git a/trunk/drivers/staging/media/solo6x10/v4l2.c b/trunk/drivers/staging/media/solo6x10/v4l2.c
index 571c3a348d30..ca774cc57539 100644
--- a/trunk/drivers/staging/media/solo6x10/v4l2.c
+++ b/trunk/drivers/staging/media/solo6x10/v4l2.c
@@ -415,10 +415,7 @@ static int solo_start_thread(struct solo_filehandle *fh)
 {
 	fh->kthread = kthread_run(solo_thread, fh, SOLO6X10_NAME "_disp");
 
-	if (IS_ERR(fh->kthread))
-		return PTR_ERR(fh->kthread);
-
-	return 0;
+	return PTR_RET(fh->kthread);
 }
 
 static void solo_stop_thread(struct solo_filehandle *fh)