git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
[safe/jmp/linux-2.6]
/
drivers
/
staging
/
usbip
/
usbip_common.c
diff --git
a/drivers/staging/usbip/usbip_common.c
b/drivers/staging/usbip/usbip_common.c
index
e3fa421
..
5240816
100644
(file)
--- a/
drivers/staging/usbip/usbip_common.c
+++ b/
drivers/staging/usbip/usbip_common.c
@@
-562,7
+562,7
@@
EXPORT_SYMBOL_GPL(sockfd_to_socket);
/* there may be more cases to tweak the flags. */
static unsigned int tweak_transfer_flags(unsigned int flags)
{
- flags &= ~
(URB_NO_TRANSFER_DMA_MAP|URB_NO_SETUP_DMA_MAP)
;
+ flags &= ~
URB_NO_TRANSFER_DMA_MAP
;
return flags;
}