diff --git a/[refs] b/[refs]
index 6453fd91b0b0..844179c91642 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e80faad3d7a332b7fe5a72dd64a81d28dd5c2e44
+refs/heads/master: aba360d8cc086e12c3eb832f32d9e9813514e295
diff --git a/trunk/drivers/media/video/soc_camera.c b/trunk/drivers/media/video/soc_camera.c
index bd8677cb1cab..91e1ab36fe5d 100644
--- a/trunk/drivers/media/video/soc_camera.c
+++ b/trunk/drivers/media/video/soc_camera.c
@@ -269,7 +269,7 @@ static int soc_camera_close(struct inode *inode, struct file *file)
 	return 0;
 }
 
-static int soc_camera_read(struct file *file, char __user *buf,
+static ssize_t soc_camera_read(struct file *file, char __user *buf,
 			   size_t count, loff_t *ppos)
 {
 	struct soc_camera_file *icf = file->private_data;