From ba4444d4a16449c6ef3233cbf8d8fd5cc7033b57 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Tue, 22 Apr 2008 14:45:59 -0300
Subject: [PATCH] --- yaml --- r: 92495 b: refs/heads/master c:
 aba360d8cc086e12c3eb832f32d9e9813514e295 h: refs/heads/master i:   92493:
 44639e18fce638524decbdd97e3d98e2c6485014   92491:
 23e46ac14fcfc121e06fa749c40163e864e71807   92487:
 45768b6eed48e60e1874cbb01d6092d12ebc9c5d   92479:
 a78a6081e938e68dc0d6effd642ba50648684b31 v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/media/video/soc_camera.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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;