diff --git a/[refs] b/[refs]
index 97ec04e9856b..90d935fff809 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 386e439f0c32eb540e931b0d1874e3fd1a8a8f10
+refs/heads/master: 583803d135b14d414e77b6d2b546a811cac9944e
diff --git a/trunk/drivers/media/video/cx18/cx18-vbi.c b/trunk/drivers/media/video/cx18/cx18-vbi.c
index a81fe2e985f2..355737bff13e 100644
--- a/trunk/drivers/media/video/cx18/cx18-vbi.c
+++ b/trunk/drivers/media/video/cx18/cx18-vbi.c
@@ -169,7 +169,7 @@ void cx18_process_vbi_data(struct cx18 *cx, struct cx18_buffer *buf,
 			   int streamtype)
 {
 	u8 *p = (u8 *) buf->buf;
-	u32 *q = (u32 *) buf->buf;
+	__be32 *q = (__be32 *) buf->buf;
 	u32 size = buf->bytesused;
 	u32 pts;
 	int lines;
@@ -178,8 +178,9 @@ void cx18_process_vbi_data(struct cx18 *cx, struct cx18_buffer *buf,
 		return;
 
 	/*
-	 * The CX23418 sends us data that is 32 bit LE swapped, but we want
-	 * the raw VBI bytes in the order they were in the raster line
+	 * The CX23418 sends us data that is 32 bit little-endian swapped,
+	 * but we want the raw VBI bytes in the order they were in the raster
+	 * line.  This has a side effect of making the 12 byte header big endian
 	 */
 	cx18_buf_swap(buf);
 
@@ -218,7 +219,7 @@ void cx18_process_vbi_data(struct cx18 *cx, struct cx18_buffer *buf,
 
 	/* Sliced VBI data with data insertion */
 
-	pts = (be32_to_cpu(q[0] == 0x3fffffff)) ? be32_to_cpu(q[2]) : 0;
+	pts = (be32_to_cpu(q[0]) == 0x3fffffff) ? be32_to_cpu(q[2]) : 0;
 
 	/*
 	 * For calls to compress_sliced_buf(), ensure there are an integral