Hi,
Please apply.
patch_name: usb_functypes.patch
patch_version: 2003-08-27.18:20:25
author: Randy.Dunlap <[EMAIL PROTECTED]>
description: usb: fix functions to match prototypes;
product: Linux
product_versions: linux-260-test4
maintainer: [EMAIL PROTECTED]
diffstat: =
drivers/usb/media/ov511.c | 2 +-
drivers/usb/media/pwc-if.c | 6 +++---
drivers/usb/media/se401.c | 2 +-
drivers/usb/media/stv680.c | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff -Naur ./drivers/usb/media/pwc-if.c~fnctype ./drivers/usb/media/pwc-if.c
--- ./drivers/usb/media/pwc-if.c~fnctype Fri Aug 22 16:58:16 2003
+++ ./drivers/usb/media/pwc-if.c Wed Aug 27 12:44:03 2003
@@ -129,7 +129,7 @@
static int pwc_video_open(struct inode *inode, struct file *file);
static int pwc_video_close(struct inode *inode, struct file *file);
-static int pwc_video_read(struct file *file, char *buf,
+static ssize_t pwc_video_read(struct file *file, char *buf,
size_t count, loff_t *ppos);
static unsigned int pwc_video_poll(struct file *file, poll_table *wait);
static int pwc_video_ioctl(struct inode *inode, struct file *file,
@@ -1116,7 +1116,7 @@
device is tricky anyhow.
*/
-static int pwc_video_read(struct file *file, char *buf,
+static ssize_t pwc_video_read(struct file *file, char *buf,
size_t count, loff_t *ppos)
{
struct video_device *vdev = file->private_data;
@@ -1124,7 +1124,7 @@
int noblock = file->f_flags & O_NONBLOCK;
DECLARE_WAITQUEUE(wait, current);
- Trace(TRACE_READ, "video_read(0x%p, %p, %d) called.\n", vdev, buf, count);
+ Trace(TRACE_READ, "video_read(0x%p, %p, %Zd) called.\n", vdev, buf, count);
if (vdev == NULL)
return -EFAULT;
pdev = vdev->priv;
diff -Naur ./drivers/usb/media/ov511.c~fnctype ./drivers/usb/media/ov511.c
--- ./drivers/usb/media/ov511.c~fnctype Fri Aug 22 16:53:53 2003
+++ ./drivers/usb/media/ov511.c Wed Aug 27 12:44:53 2003
@@ -4592,7 +4592,7 @@
return rc;
}
-static int
+static ssize_t
ov51x_v4l1_read(struct file *file, char *buf, size_t cnt, loff_t *ppos)
{
struct video_device *vdev = file->private_data;
diff -Naur ./drivers/usb/media/se401.c~fnctype ./drivers/usb/media/se401.c
--- ./drivers/usb/media/se401.c~fnctype Fri Aug 22 16:53:49 2003
+++ ./drivers/usb/media/se401.c Wed Aug 27 12:45:24 2003
@@ -1252,7 +1252,7 @@
return video_usercopy(inode, file, cmd, arg, se401_do_ioctl);
}
-static int se401_read(struct file *file, char *buf,
+static ssize_t se401_read(struct file *file, char *buf,
size_t count, loff_t *ppos)
{
int realcount=count, ret=0;
diff -Naur ./drivers/usb/media/stv680.c~fnctype ./drivers/usb/media/stv680.c
--- ./drivers/usb/media/stv680.c~fnctype Fri Aug 22 16:57:48 2003
+++ ./drivers/usb/media/stv680.c Wed Aug 27 12:46:09 2003
@@ -1385,7 +1385,7 @@
return 0;
}
-static int stv680_read (struct file *file, char *buf,
+static ssize_t stv680_read (struct file *file, char *buf,
size_t count, loff_t *ppos)
{
struct video_device *dev = file->private_data;
--
~Randy
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
