diff options
Diffstat (limited to 'drivers/usb/storage/transport.c')
-rw-r--r-- | drivers/usb/storage/transport.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/usb/storage/transport.c b/drivers/usb/storage/transport.c index e42875152c34..c1ba5301ebfc 100644 --- a/drivers/usb/storage/transport.c +++ b/drivers/usb/storage/transport.c | |||
@@ -96,8 +96,8 @@ | |||
96 | * or before the URB_ACTIVE bit was set. If so, it's essential to cancel | 96 | * or before the URB_ACTIVE bit was set. If so, it's essential to cancel |
97 | * the URB if it hasn't been cancelled already (i.e., if the URB_ACTIVE bit | 97 | * the URB if it hasn't been cancelled already (i.e., if the URB_ACTIVE bit |
98 | * is still set). Either way, the function must then wait for the URB to | 98 | * is still set). Either way, the function must then wait for the URB to |
99 | * finish. Note that because the URB_ASYNC_UNLINK flag is set, the URB can | 99 | * finish. Note that the URB can still be in progress even after a call to |
100 | * still be in progress even after a call to usb_unlink_urb() returns. | 100 | * usb_unlink_urb() returns. |
101 | * | 101 | * |
102 | * The idea is that (1) once the ABORTING or DISCONNECTING bit is set, | 102 | * The idea is that (1) once the ABORTING or DISCONNECTING bit is set, |
103 | * either the stop_transport() function or the submitting function | 103 | * either the stop_transport() function or the submitting function |
@@ -158,8 +158,7 @@ static int usb_stor_msg_common(struct us_data *us, int timeout) | |||
158 | * hasn't been mapped for DMA. Yes, this is clunky, but it's | 158 | * hasn't been mapped for DMA. Yes, this is clunky, but it's |
159 | * easier than always having the caller tell us whether the | 159 | * easier than always having the caller tell us whether the |
160 | * transfer buffer has already been mapped. */ | 160 | * transfer buffer has already been mapped. */ |
161 | us->current_urb->transfer_flags = | 161 | us->current_urb->transfer_flags = URB_NO_SETUP_DMA_MAP; |
162 | URB_ASYNC_UNLINK | URB_NO_SETUP_DMA_MAP; | ||
163 | if (us->current_urb->transfer_buffer == us->iobuf) | 162 | if (us->current_urb->transfer_buffer == us->iobuf) |
164 | us->current_urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP; | 163 | us->current_urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP; |
165 | us->current_urb->transfer_dma = us->iobuf_dma; | 164 | us->current_urb->transfer_dma = us->iobuf_dma; |