diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c
index 59181667066ce7cfa9b382685c921fe3d0fb52fb..3451e8d03ab0e4653ff2f7208077f565f7294e19 100644
--- a/drivers/usb/storage/usb.c
+++ b/drivers/usb/storage/usb.c
@@ -960,6 +960,10 @@ static int storage_probe(struct usb_interface *intf,
 		return -ENOMEM;
 	}
 
+	/*
+	 * Allow 16-byte CDBs and thus > 2TB
+	 */
+	host->max_cmd_len = 16;
 	us = host_to_us(host);
 	memset(us, 0, sizeof(struct us_data));
 	mutex_init(&(us->dev_mutex));