This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / usb / host / uhci-debug.c

diff --git a/drivers/usb/host/uhci-debug.c b/drivers/usb/host/uhci-debug.c
index a0721d0..133e50c 100644 (file)
--- a/drivers/usb/host/uhci-debug.c
+++ b/drivers/usb/host/uhci-debug.c
@@ -571,7 +571,22 @@ static ssize_t uhci_proc_read(struct file *file, char __user *buf,
                                size_t nbytes, loff_t *ppos)
 {
        struct uhci_proc *up = file->private_data;
-       return simple_read_from_buffer(buf, nbytes, ppos, up->data, up->size);
+       unsigned int pos;
+       unsigned int size;
+
+       pos = *ppos;
+       size = up->size;
+       if (pos >= size)
+               return 0;
+       if (nbytes > size - pos)
+               nbytes = size - pos;
+
+       if (copy_to_user(buf, up->data + pos, nbytes))
+               return -EFAULT;
+
+       *ppos += nbytes;
+
+       return nbytes;
 }
 
 static int uhci_proc_release(struct inode *inode, struct file *file)