---

yaml --- r: 92495 b: refs/heads/master c: aba360d h: refs/heads/master i: 92493: 44639e1 92491: 23e46ac 92487: 45768b6 92479: a78a608 v: v3
git-mirror · Apr 24, 2008 · ba4444d · ba4444d
1 parent 01cf660
commit ba4444d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;