VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

[linux-2.6.git] / drivers / usb / media / se401.c

diff --git a/drivers/usb/media/se401.c b/drivers/usb/media/se401.c
index ac19cfb..260bbd9 100644 (file)
--- a/drivers/usb/media/se401.c
+++ b/drivers/usb/media/se401.c
@@ -1121,7 +1121,7 @@ static int se401_ioctl(struct inode *inode, struct file *file,
        return video_usercopy(inode, file, cmd, arg, se401_do_ioctl);
 }
 
-static ssize_t se401_read(struct file *file, char *buf,
+static ssize_t se401_read(struct file *file, char __user *buf,
                     size_t count, loff_t *ppos)
 {
        int realcount=count, ret=0;
@@ -1295,7 +1295,7 @@ static int se401_init(struct usb_se401 *se401, int button)
                    &se401->button, sizeof(se401->button),
                    se401_button_irq,
                    se401,
-                   HZ/10
+                   8
                );
                if (usb_submit_urb(se401->inturb, GFP_KERNEL)) {
                        info("int urb burned down");