Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 28372
b: refs/heads/master
c: 786dc1d
h: refs/heads/master
v: v3
  • Loading branch information
Philippe Retornaz authored and Greg Kroah-Hartman committed Jun 21, 2006
1 parent aede349 commit cc63e66
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6ad07129a8ed2e13dcd7e6313c201c32bcf7cc32
refs/heads/master: 786dc1d3d7333f269e17d742886eac2188a2d9cc
8 changes: 6 additions & 2 deletions trunk/drivers/usb/core/devio.c
Original file line number Diff line number Diff line change
Expand Up @@ -1078,7 +1078,9 @@ static int proc_submiturb(struct dev_state *ps, void __user *arg)
if (copy_from_user(&uurb, arg, sizeof(uurb)))
return -EFAULT;

return proc_do_submiturb(ps, &uurb, (((struct usbdevfs_urb __user *)arg)->iso_frame_desc), arg);
return proc_do_submiturb(ps, &uurb,
(struct usbdevfs_iso_packet_desc __user *)uurb.iso_frame_desc,
arg);
}

static int proc_unlinkurb(struct dev_state *ps, void __user *arg)
Expand Down Expand Up @@ -1203,7 +1205,9 @@ static int proc_submiturb_compat(struct dev_state *ps, void __user *arg)
if (get_urb32(&uurb,(struct usbdevfs_urb32 *)arg))
return -EFAULT;

return proc_do_submiturb(ps, &uurb, ((struct usbdevfs_urb32 __user *)arg)->iso_frame_desc, arg);
return proc_do_submiturb(ps, &uurb,
(struct usbdevfs_iso_packet_desc __user *)uurb.iso_frame_desc,
arg);
}

static int processcompl_compat(struct async *as, void __user * __user *arg)
Expand Down

0 comments on commit cc63e66

Please sign in to comment.