---

yaml
---
r: 127243
b: refs/heads/master
c: 96983d2
h: refs/heads/master
i:
  127241: b5ec804
  127239: 7e1ca2f
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3dae5345311271fe598a61bd01f563fc835b4217
+refs/heads/master: 96983d2d861bf94b7f70bc47ac3c5b289f519a2d

trunk/drivers/usb/storage/scsiglue.c

@@ -129,6 +129,14 @@ static int slave_configure(struct scsi_device *sdev)
 					      max_sectors);
 	}
 
+	/* Some USB host controllers can't do DMA; they have to use PIO.
+	 * They indicate this by setting their dma_mask to NULL.  For
+	 * such controllers we need to make sure the block layer sets
+	 * up bounce buffers in addressable memory.
+	 */
+	if (!us->pusb_dev->bus->controller->dma_mask)
+		blk_queue_bounce_limit(sdev->request_queue, BLK_BOUNCE_HIGH);
+
 	/* We can't put these settings in slave_alloc() because that gets
 	 * called before the device type is known.  Consequently these
 	 * settings can't be overridden via the scsi devinfo mechanism. */