1 files changed, 6 insertions, 2 deletions

diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c
index 5600c33fcadb..6c10c888f35f 100644
--- a/drivers/usb/storage/usb.c
+++ b/drivers/usb/storage/usb.c
@@ -479,7 +479,8 @@ void usb_stor_adjust_quirks(struct usb_device *udev, unsigned long *fflags)
                         US_FL_SINGLE_LUN | US_FL_NO_WP_DETECT |
                         US_FL_NO_READ_DISC_INFO | US_FL_NO_READ_CAPACITY_16 |
                         US_FL_INITIAL_READ10 | US_FL_WRITE_CACHE |
-                        US_FL_NO_ATA_1X | US_FL_NO_REPORT_OPCODES);
+                        US_FL_NO_ATA_1X | US_FL_NO_REPORT_OPCODES |
+                        US_FL_MAX_SECTORS_240);
 
         p = quirks;
         while (*p) {
@@ -520,6 +521,9 @@ void usb_stor_adjust_quirks(struct usb_device *udev, unsigned long *fflags)
                 case 'f':
                         f |= US_FL_NO_REPORT_OPCODES;
                         break;
+                case 'g':
+                        f |= US_FL_MAX_SECTORS_240;
+                        break;
                 case 'h':
                         f |= US_FL_CAPACITY_HEURISTICS;
                         break;
@@ -1080,7 +1084,7 @@ static int storage_probe(struct usb_interface *intf,
 
         /* If uas is enabled and this device can do uas then ignore it. */
 #if IS_ENABLED(CONFIG_USB_UAS)
-        if (uas_use_uas_driver(intf, id))
+        if (uas_use_uas_driver(intf, id, NULL))
                 return -ENXIO;
 #endif