From a92d837385be670e31b2068d27b40a68e42df128 Mon Sep 17 00:00:00 2001
From: Karl Relton <karllinuxtest.relton@ntlworld.com>
Date: Wed, 18 May 2011 21:42:34 +0100
Subject: [PATCH] --- yaml --- r: 248895 b: refs/heads/master c:
 5116901d8596a52598364d41581c0a745da003bc h: refs/heads/master i:   248893:
 3a8cf1b0bda06d2bf0b7c5b53f2ffa835e52bd47   248891:
 bc2ece765f0a260ea3389fe5c6c68fc354bcc87a   248887:
 3478c38bf74ded158de98a533c2613ba0b713ad6   248879:
 3502dc15f6034e01e577c9274ec7a8e31353d00a   248863:
 90b32617faf7b87dbcab05a90b1fda46f8a14125   248831:
 9b1fade141dab63225fb3d45078dd77e175fdfef v: v3

---
 [refs]                                    | 2 +-
 trunk/Documentation/kernel-parameters.txt | 4 ++++
 trunk/drivers/usb/storage/usb.c           | 9 ++++++++-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index dcfecfb77497..a66e19f15b3e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d05b6ec01b8186f847ac9e41098e40858926db40
+refs/heads/master: 5116901d8596a52598364d41581c0a745da003bc
diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt
index cc85a9278190..0e545e044c1b 100644
--- a/trunk/Documentation/kernel-parameters.txt
+++ b/trunk/Documentation/kernel-parameters.txt
@@ -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);
diff --git a/trunk/drivers/usb/storage/usb.c b/trunk/drivers/usb/storage/usb.c
index 4219c197cb08..5ee7ac42e08f 100644
--- a/trunk/drivers/usb/storage/usb.c
+++ b/trunk/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;