commented early_printk patch because of rejects.

[linux-flexiantxendom0-3.2.10.git] / drivers / media / video / c-qcam.c

diff --git a/drivers/media/video/c-qcam.c b/drivers/media/video/c-qcam.c
index a28dc95..68d272d 100644 (file)
--- a/drivers/media/video/c-qcam.c
+++ b/drivers/media/video/c-qcam.c
@@ -668,8 +668,8 @@ static int qcam_ioctl(struct inode *inode, struct file *file,
        return video_usercopy(inode, file, cmd, arg, qcam_do_ioctl);
 }
 
-static int qcam_read(struct file *file, char *buf,
-                    size_t count, loff_t *ppos)
+static ssize_t qcam_read(struct file *file, char *buf,
+                        size_t count, loff_t *ppos)
 {
        struct video_device *v = video_devdata(file);
        struct qcam_device *qcam=(struct qcam_device *)v;