diff --git a/[refs] b/[refs]
index 8f01bfcfbe7a..4eecffaa95e6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 409d84f85a8d523ecd108cbe2c0e722682da95ff
+refs/heads/master: 925343ecdfd3f1dafd1049ddd4944621bbe3422e
diff --git a/trunk/drivers/media/video/zoran_driver.c b/trunk/drivers/media/video/zoran_driver.c
index d831ca16d9e9..1c14fa2bd411 100644
--- a/trunk/drivers/media/video/zoran_driver.c
+++ b/trunk/drivers/media/video/zoran_driver.c
@@ -339,10 +339,7 @@ v4l_fbuffer_alloc (struct file *file)
 		if (fh->v4l_buffers.buffer_size <= MAX_KMALLOC_MEM) {
 			/* Use kmalloc */
 
-			mem =
-			    (unsigned char *) kmalloc(fh->v4l_buffers.
-						      buffer_size,
-						      GFP_KERNEL);
+			mem = kmalloc(fh->v4l_buffers.buffer_size, GFP_KERNEL);
 			if (mem == 0) {
 				dprintk(1,
 					KERN_ERR