summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/soc_camera.c
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2008-04-22 19:45:59 +0200
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-04-24 19:07:51 +0200
commitaba360d8cc086e12c3eb832f32d9e9813514e295 (patch)
tree49c5951886d444f0ea07ff2f2a89c0ebf6b8848f /drivers/media/video/soc_camera.c
parentV4L/DVB (7368): bttv: added support for Kozumi KTV-01C card (diff)
downloadlinux-aba360d8cc086e12c3eb832f32d9e9813514e295.tar.xz
linux-aba360d8cc086e12c3eb832f32d9e9813514e295.zip
V4L/DVB (7369): drivers/media/video/soc_camera.c: reads return size_t
Signed-off-by: Andrew Morton <akpm@linux-foundation.org> CC: Guennadi Liakhovetski <kernel@pengutronix.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/soc_camera.c')
-rw-r--r--drivers/media/video/soc_camera.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/soc_camera.c b/drivers/media/video/soc_camera.c
index bd8677cb1cab..91e1ab36fe5d 100644
--- a/drivers/media/video/soc_camera.c
+++ b/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;