projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[POWERPC] mpc52xx_pic: fix main interrupt masking
[powerpc.git]
/
drivers
/
usb
/
core
/
urb.c
diff --git
a/drivers/usb/core/urb.c
b/drivers/usb/core/urb.c
index
9801d08
..
94ea972
100644
(file)
--- a/
drivers/usb/core/urb.c
+++ b/
drivers/usb/core/urb.c
@@
-235,16
+235,15
@@
int usb_submit_urb(struct urb *urb, gfp_t mem_flags)
urb->status = -EINPROGRESS;
urb->actual_length = 0;
urb->status = -EINPROGRESS;
urb->actual_length = 0;
- urb->bandwidth = 0;
/* Lots of sanity checks, so HCDs can rely on clean data
* and don't need to duplicate tests
*/
pipe = urb->pipe;
/* Lots of sanity checks, so HCDs can rely on clean data
* and don't need to duplicate tests
*/
pipe = urb->pipe;
- temp = usb_pipetype
(pipe);
- is_out = usb_pipeout
(pipe);
+ temp = usb_pipetype(pipe);
+ is_out = usb_pipeout(pipe);
- if (!usb_pipecontrol
(pipe) && dev->state < USB_STATE_CONFIGURED)
+ if (!usb_pipecontrol(pipe) && dev->state < USB_STATE_CONFIGURED)
return -ENODEV;
/* FIXME there should be a sharable lock protecting us against
return -ENODEV;
/* FIXME there should be a sharable lock protecting us against
@@
-253,11
+252,11
@@
int usb_submit_urb(struct urb *urb, gfp_t mem_flags)
* checks get made.)
*/
* checks get made.)
*/
- max = usb_maxpacket
(dev, pipe, is_out);
+ max = usb_maxpacket(dev, pipe, is_out);
if (max <= 0) {
dev_dbg(&dev->dev,
"bogus endpoint ep%d%s in %s (bad maxpacket %d)\n",
if (max <= 0) {
dev_dbg(&dev->dev,
"bogus endpoint ep%d%s in %s (bad maxpacket %d)\n",
- usb_pipeendpoint
(pipe), is_out ? "out" : "in",
+ usb_pipeendpoint(pipe), is_out ? "out" : "in",
__FUNCTION__, max);
return -EMSGSIZE;
}
__FUNCTION__, max);
return -EMSGSIZE;
}
@@
-279,11
+278,11
@@
int usb_submit_urb(struct urb *urb, gfp_t mem_flags)
if (urb->number_of_packets <= 0)
return -EINVAL;
for (n = 0; n < urb->number_of_packets; n++) {
if (urb->number_of_packets <= 0)
return -EINVAL;
for (n = 0; n < urb->number_of_packets; n++) {
- len = urb->iso_frame_desc
[n].length;
+ len = urb->iso_frame_desc[n].length;
if (len < 0 || len > max)
return -EMSGSIZE;
if (len < 0 || len > max)
return -EMSGSIZE;
- urb->iso_frame_desc
[n].status = -EXDEV;
- urb->iso_frame_desc
[n].actual_length = 0;
+ urb->iso_frame_desc[n].status = -EXDEV;
+ urb->iso_frame_desc[n].actual_length = 0;
}
}
}
}
@@
-322,7
+321,7
@@
int usb_submit_urb(struct urb *urb, gfp_t mem_flags)
/* fail if submitter gave bogus flags */
if (urb->transfer_flags != orig_flags) {
/* fail if submitter gave bogus flags */
if (urb->transfer_flags != orig_flags) {
- err
("BOGUS urb flags, %x --> %x",
+ err("BOGUS urb flags, %x --> %x",
orig_flags, urb->transfer_flags);
return -EINVAL;
}
orig_flags, urb->transfer_flags);
return -EINVAL;
}
@@
-373,7
+372,7
@@
int usb_submit_urb(struct urb *urb, gfp_t mem_flags)
urb->interval = temp;
}
urb->interval = temp;
}
- return usb_hcd_submit_urb
(urb, mem_flags);
+ return usb_hcd_submit_urb(urb, mem_flags);
}
/*-------------------------------------------------------------------*/
}
/*-------------------------------------------------------------------*/