diff options
author | Chris Metcalf <cmetcalf@tilera.com> | 2010-11-24 18:30:28 (GMT) |
---|---|---|
committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-11-24 18:30:28 (GMT) |
commit | b03a6c4c7d8ebd8118d668eafdb85f5f76b5437f (patch) | |
tree | f6ca7059e9c1bc1aac9a6741316f8e07ba349f7f /drivers/staging/keucr/transport.c | |
parent | 24f3f6b5eff92608a62449e33bfac0eed1447d02 (diff) | |
parent | 3561d43fd289f590fdae672e5eb831b8d5cf0bf6 (diff) | |
download | linux-fsl-qoriq-b03a6c4c7d8ebd8118d668eafdb85f5f76b5437f.tar.xz |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/staging/keucr/transport.c')
-rw-r--r-- | drivers/staging/keucr/transport.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/keucr/transport.c b/drivers/staging/keucr/transport.c index fd98df6..111160c 100644 --- a/drivers/staging/keucr/transport.c +++ b/drivers/staging/keucr/transport.c @@ -40,7 +40,7 @@ static int usb_stor_msg_common(struct us_data *us, int timeout) us->current_urb->error_count = 0; us->current_urb->status = 0; -// us->current_urb->transfer_flags = URB_NO_SETUP_DMA_MAP; + us->current_urb->transfer_flags = 0; if (us->current_urb->transfer_buffer == us->iobuf) us->current_urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP; us->current_urb->transfer_dma = us->iobuf_dma; |