From 392b76ee02ba58f6a7be6bb94a07cb8ea4a5b8d7 Mon Sep 17 00:00:00 2001
From: Alan Stern <stern@rowland.harvard.edu>
Date: Fri, 10 Oct 2008 16:03:20 -0400
Subject: [PATCH] --- yaml --- r: 117709 b: refs/heads/master c:
 d4c9b736080056ae3ba81dcf2ac418193c57dbb1 h: refs/heads/master i:   117707:
 a1beceb395752ab0a75cd0e96f0911d007d585b1 v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/scsi/sd.c | 9 ---------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 1e6fca6e7efe..c1078c75838b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 36a529202b334d0513cfeabeadca940ec41c8165
+refs/heads/master: d4c9b736080056ae3ba81dcf2ac418193c57dbb1
diff --git a/trunk/drivers/scsi/sd.c b/trunk/drivers/scsi/sd.c
index 55e6ed4b886d..7e22aa7b8b8a 100644
--- a/trunk/drivers/scsi/sd.c
+++ b/trunk/drivers/scsi/sd.c
@@ -1084,15 +1084,6 @@ static int sd_done(struct scsi_cmnd *SCpnt)
 			scsi_print_sense("sd", SCpnt);
 			good_bytes = sd_completed_bytes(SCpnt);
 		}
-		if (!scsi_device_protection(SCpnt->device) &&
-		    SCpnt->device->use_10_for_rw &&
-		    (SCpnt->cmnd[0] == READ_10 ||
-		     SCpnt->cmnd[0] == WRITE_10))
-			SCpnt->device->use_10_for_rw = 0;
-		if (SCpnt->device->use_10_for_ms &&
-		    (SCpnt->cmnd[0] == MODE_SENSE_10 ||
-		     SCpnt->cmnd[0] == MODE_SELECT_10))
-			SCpnt->device->use_10_for_ms = 0;
 		break;
 	default:
 		break;