This patch removes the code that faked the EVPD INQUIRY.  The SCSI core no
longer does that, so there is no need to filter it.

Greg, please apply.

Matt

# This is a BitKeeper generated patch for the following project:
# Project Name: greg k-h's linux 2.5 USB kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#                  ChangeSet    1.698   -> 1.699  
#       drivers/usb/storage/usb.c       1.72    -> 1.73   
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/06/08      [EMAIL PROTECTED]       1.699
# Remove now-unneeded code to bypass EVPD commands.
# --------------------------------------------
#
diff -Nru a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c
--- a/drivers/usb/storage/usb.c Sun Jun  8 14:15:45 2003
+++ b/drivers/usb/storage/usb.c Sun Jun  8 14:15:45 2003
@@ -364,17 +364,6 @@
                        us->srb->result = DID_BAD_TARGET << 16;
                }
 
-               /* handle requests for EVPD, which most USB devices do
-                * not support */
-               else if((us->srb->cmnd[0] == INQUIRY) &&
-                               (us->srb->cmnd[1] & 0x1)) {
-                               US_DEBUGP("Faking INQUIRY command for EVPD\n");
-                               memcpy(us->srb->sense_buffer, 
-                                      usb_stor_sense_invalidCDB, 
-                                      sizeof(usb_stor_sense_invalidCDB));
-                               us->srb->result = SAM_STAT_CHECK_CONDITION;
-               }
-
                /* Handle those devices which need us to fake 
                 * their inquiry data */
                else if ((us->srb->cmnd[0] == INQUIRY) &&
-- 
Matthew Dharm                              Home: [EMAIL PROTECTED] 
Maintainer, Linux USB Mass Storage Driver

Da.  Am thinkink of carbonated borscht for lonk nights of coding.
                                        -- Pitr
User Friendly, 7/24/1998

Attachment: pgp00000.pgp
Description: PGP signature

Reply via email to