Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6

[~andy/linux] / drivers / usb / wusbcore / wa-xfer.c

diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c
index 112ef7e26f6bf69af4f32c78d4255b68af2e554a..84b744c428a4bcc72593ce9c77ac4c4e8bc6fddc 100644 (file)
--- a/drivers/usb/wusbcore/wa-xfer.c
+++ b/drivers/usb/wusbcore/wa-xfer.c
@@ -76,7 +76,7 @@
  *     xfers-per-ripe, blocks-per-rpipe, rpipes-per-host), at the end
  *     we are going to have to rebuild all this based on an scheduler,
  *     to where we have a list of transactions to do and based on the
- *     availability of the different requried components (blocks,
+ *     availability of the different required components (blocks,
  *     rpipes, segment slots, etc), we go scheduling them. Painful.
  */
 #include <linux/init.h>
@@ -474,8 +474,6 @@ static void __wa_xfer_setup_hdr0(struct wa_xfer *xfer,
                struct wa_xfer_ctl *xfer_ctl =
                        container_of(xfer_hdr0, struct wa_xfer_ctl, hdr);
                xfer_ctl->bmAttribute = xfer->is_inbound ? 1 : 0;
-               BUG_ON(xfer->urb->transfer_flags & URB_NO_SETUP_DMA_MAP
-                      && xfer->urb->setup_packet == NULL);
                memcpy(&xfer_ctl->baSetupData, xfer->urb->setup_packet,
                       sizeof(xfer_ctl->baSetupData));
                break;