diff --git a/[refs] b/[refs]
index 7a243aa90dd6..f64e4a56d807 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 75965b8f6fcb3f41b256c365d34ba1eca3cdbe93
+refs/heads/master: 6f87cc6cd91a077cc9b6946cc1cb63032d15ecb4
diff --git a/trunk/drivers/staging/cx25821/cx25821-video.c b/trunk/drivers/staging/cx25821/cx25821-video.c
index fb89c2785b1a..4d3d4f25edc2 100644
--- a/trunk/drivers/staging/cx25821/cx25821-video.c
+++ b/trunk/drivers/staging/cx25821/cx25821-video.c
@@ -1726,17 +1726,17 @@ static long video_ioctl_upstream9(struct file *file, unsigned int cmd,
 	dev->channel_select = data_from_user->channel_select;
 	dev->command = data_from_user->command;
 
-       switch (command) {
-       case UPSTREAM_START_VIDEO:
-	       cx25821_start_upstream_video_ch1(dev, data_from_user);
-	       break;
+	switch (command) {
+	case UPSTREAM_START_VIDEO:
+		cx25821_start_upstream_video_ch1(dev, data_from_user);
+		break;
 
-       case UPSTREAM_STOP_VIDEO:
-	       cx25821_stop_upstream_video_ch1(dev);
-	       break;
-       }
+	case UPSTREAM_STOP_VIDEO:
+		cx25821_stop_upstream_video_ch1(dev);
+		break;
+	}
 
-       return 0;
+	return 0;
 }
 
 static long video_ioctl_upstream10(struct file *file, unsigned int cmd,