usb-storage: Correct adjust_quirks to include latest flags

Commits ae38c78a03e1b77ad45248fcf097e4568e740209
and 00914025cc4e783d4703b4db1d47b41f389e50c8 added quirk flags
US_FL_NO_READ_DISC_INFO and US_FL_NO_READ_CAPACITY_16 to
the usb-storage driver. However they did not add the corresponding flags
to adjust_quirks() in usb.c, so there was no facility for a user
to over-ride/add them via the quirks module parameter.

Signed-off-by: Karl Relton <karllinuxtest.relton@ntlworld.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 8 insertions, 1 deletions

diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c
index 4219c197cb08..5ee7ac42e08f 100644
--- a/drivers/usb/storage/usb.c
+++ b/drivers/usb/storage/usb.c
@@ -439,7 +439,8 @@ static void adjust_quirks(struct us_data *us)
                         US_FL_CAPACITY_HEURISTICS | US_FL_IGNORE_DEVICE |
                         US_FL_NOT_LOCKABLE | US_FL_MAX_SECTORS_64 |
                         US_FL_CAPACITY_OK | US_FL_IGNORE_RESIDUE |
-                        US_FL_SINGLE_LUN | US_FL_NO_WP_DETECT);
+                        US_FL_SINGLE_LUN | US_FL_NO_WP_DETECT |
+                        US_FL_NO_READ_DISC_INFO | US_FL_NO_READ_CAPACITY_16);
 
         p = quirks;
         while (*p) {
@@ -471,6 +472,12 @@ static void adjust_quirks(struct us_data *us)
                 case 'c':
                         f |= US_FL_FIX_CAPACITY;
                         break;
+                case 'd':
+                        f |= US_FL_NO_READ_DISC_INFO;
+                        break;
+                case 'e':
+                        f |= US_FL_NO_READ_CAPACITY_16;
+                        break;
                 case 'h':
                         f |= US_FL_CAPACITY_HEURISTICS;
                         break;