Merge commit 'v2.6.29-rc1' into core/urgent

1 files changed, 1 insertions, 6 deletions

diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
index aa79280df15d..26fece124e0e 100644
--- a/drivers/usb/core/devio.c
+++ b/drivers/usb/core/devio.c
@@ -981,9 +981,6 @@ static int proc_do_submiturb(struct dev_state *ps, struct usbdevfs_urb *uurb,
                 return -EINVAL;
         if (!uurb->buffer)
                 return -EINVAL;
-        if (uurb->signr != 0 && (uurb->signr < SIGRTMIN ||
-                                 uurb->signr > SIGRTMAX))
-                return -EINVAL;
         if (!(uurb->type == USBDEVFS_URB_TYPE_CONTROL &&
             (uurb->endpoint & ~USB_ENDPOINT_DIR_MASK) == 0)) {
                 ifnum = findintfep(ps->dev, uurb->endpoint);
@@ -1320,7 +1317,7 @@ static int get_urb32(struct usbdevfs_urb *kurb,
         if (__get_user(uptr, &uurb->buffer))
                 return -EFAULT;
         kurb->buffer = compat_ptr(uptr);
-        if (__get_user(uptr, &uurb->buffer))
+        if (__get_user(uptr, &uurb->usercontext))
                 return -EFAULT;
         kurb->usercontext = compat_ptr(uptr);
 
@@ -1401,8 +1398,6 @@ static int proc_disconnectsignal(struct dev_state *ps, void __user *arg)
 
         if (copy_from_user(&ds, arg, sizeof(ds)))
                 return -EFAULT;
-        if (ds.signr != 0 && (ds.signr < SIGRTMIN || ds.signr > SIGRTMAX))
-                return -EINVAL;
         ps->discsignr = ds.signr;
         ps->disccontext = ds.context;
         return 0;