diff options
author | Karl Relton <karllinuxtest.relton@ntlworld.com> | 2011-05-18 16:42:34 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-05-19 19:34:05 -0400 |
commit | 5116901d8596a52598364d41581c0a745da003bc (patch) | |
tree | 4f3ca713c45a7c336929ee969d698a6b0e7fdc28 | |
parent | d05b6ec01b8186f847ac9e41098e40858926db40 (diff) |
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>
-rw-r--r-- | Documentation/kernel-parameters.txt | 4 | ||||
-rw-r--r-- | drivers/usb/storage/usb.c | 9 |
2 files changed, 12 insertions, 1 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index cc85a9278190..0e545e044c1b 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
@@ -2581,6 +2581,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted. | |||
2581 | bytes of sense data); | 2581 | bytes of sense data); |
2582 | c = FIX_CAPACITY (decrease the reported | 2582 | c = FIX_CAPACITY (decrease the reported |
2583 | device capacity by one sector); | 2583 | device capacity by one sector); |
2584 | d = NO_READ_DISC_INFO (don't use | ||
2585 | READ_DISC_INFO command); | ||
2586 | e = NO_READ_CAPACITY_16 (don't use | ||
2587 | READ_CAPACITY_16 command); | ||
2584 | h = CAPACITY_HEURISTICS (decrease the | 2588 | h = CAPACITY_HEURISTICS (decrease the |
2585 | reported device capacity by one | 2589 | reported device capacity by one |
2586 | sector if the number is odd); | 2590 | sector if the number is odd); |
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) | |||
439 | US_FL_CAPACITY_HEURISTICS | US_FL_IGNORE_DEVICE | | 439 | US_FL_CAPACITY_HEURISTICS | US_FL_IGNORE_DEVICE | |
440 | US_FL_NOT_LOCKABLE | US_FL_MAX_SECTORS_64 | | 440 | US_FL_NOT_LOCKABLE | US_FL_MAX_SECTORS_64 | |
441 | US_FL_CAPACITY_OK | US_FL_IGNORE_RESIDUE | | 441 | US_FL_CAPACITY_OK | US_FL_IGNORE_RESIDUE | |
442 | US_FL_SINGLE_LUN | US_FL_NO_WP_DETECT); | 442 | US_FL_SINGLE_LUN | US_FL_NO_WP_DETECT | |
443 | US_FL_NO_READ_DISC_INFO | US_FL_NO_READ_CAPACITY_16); | ||
443 | 444 | ||
444 | p = quirks; | 445 | p = quirks; |
445 | while (*p) { | 446 | while (*p) { |
@@ -471,6 +472,12 @@ static void adjust_quirks(struct us_data *us) | |||
471 | case 'c': | 472 | case 'c': |
472 | f |= US_FL_FIX_CAPACITY; | 473 | f |= US_FL_FIX_CAPACITY; |
473 | break; | 474 | break; |
475 | case 'd': | ||
476 | f |= US_FL_NO_READ_DISC_INFO; | ||
477 | break; | ||
478 | case 'e': | ||
479 | f |= US_FL_NO_READ_CAPACITY_16; | ||
480 | break; | ||
474 | case 'h': | 481 | case 'h': |
475 | f |= US_FL_CAPACITY_HEURISTICS; | 482 | f |= US_FL_CAPACITY_HEURISTICS; |
476 | break; | 483 | break; |