diff --git a/[refs] b/[refs]
index 5cc8754b8e94..73afd2e294ea 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7e7beb8c255e91bfb4701f2757036c8fbe5a6592
+refs/heads/master: 1316b63ccde5bed161c6e346cc8f1752bd5c83cc
diff --git a/trunk/drivers/media/video/cx25821/cx25821-video.c b/trunk/drivers/media/video/cx25821/cx25821-video.c
index 79c455323d72..df4f5b1b114f 100644
--- a/trunk/drivers/media/video/cx25821/cx25821-video.c
+++ b/trunk/drivers/media/video/cx25821/cx25821-video.c
@@ -1931,9 +1931,9 @@ static long video_ioctl_set(struct file *file, unsigned int cmd,
 static long cx25821_video_ioctl(struct file *file,
 				unsigned int cmd, unsigned long arg)
 {
-	int  ret = 0;
+	int ret = 0;
 
-	struct cx25821_fh  *fh  = file->private_data;
+	struct cx25821_fh *fh = file->private_data;
 
 	/* check to see if it's the video upstream */
 	if (fh->channel_id == SRAM_CH09) {