Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5116901d authored by Karl Relton's avatar Karl Relton Committed by Greg Kroah-Hartman
Browse files

usb-storage: Correct adjust_quirks to include latest flags 



Commits ae38c78a
and 00914025 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: default avatarKarl Relton <karllinuxtest.relton@ntlworld.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent d05b6ec0

Documentation/kernel-parameters.txt

+4 −0
Original line number Diff line number Diff line
@@ -2581,6 +2581,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
					bytes of sense data);

				c = FIX_CAPACITY (decrease the reported

					device capacity by one sector);

				d = NO_READ_DISC_INFO (don't use

					READ_DISC_INFO command);

				e = NO_READ_CAPACITY_16 (don't use

					READ_CAPACITY_16 command);

				h = CAPACITY_HEURISTICS (decrease the

					reported device capacity by one

					sector if the number is odd);

drivers/usb/storage/usb.c

+8 −1
Original line number Diff line number Diff line
@@ -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;