diff options
author | Alan Stern <stern@rowland.harvard.edu> | 2007-11-08 15:15:28 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-02-01 14:34:49 -0800 |
commit | 676d3aa16f66d94bf5654781b77d1e070c8b0514 (patch) | |
tree | 68d549b26bd32a02645b68af94ca5a77c50878ea | |
parent | fec8de3aada6338a4069ee1df4726dd7bbbdf476 (diff) | |
download | linux-stable-676d3aa16f66d94bf5654781b77d1e070c8b0514.tar.gz linux-stable-676d3aa16f66d94bf5654781b77d1e070c8b0514.tar.bz2 linux-stable-676d3aa16f66d94bf5654781b77d1e070c8b0514.zip |
USB: usb-storage: new "lockable" subclass 0x07
This patch (as1011) adds a #define for the newly-created Lockable
(i.e., password-protected) subclass 0x07 for USB mass-storage devices.
The private ISD200 entry (which had been mapped to subclass 0x07) is
moved to 0xf0, which is unlikely to conflict with any official
subclass designation.
The US_SC_MIN and US_SC_MAX constants aren't used anywhere, so the
patch removes them.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Cc: Matthew Dharm <mdharm-usb@one-eyed-alien.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | include/linux/usb_usual.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/usb_usual.h b/include/linux/usb_usual.h index a417b09b8b3d..cee0623b3c7b 100644 --- a/include/linux/usb_usual.h +++ b/include/linux/usb_usual.h @@ -80,10 +80,9 @@ enum { US_DO_ALL_FLAGS }; #define US_SC_UFI 0x04 /* Floppy */ #define US_SC_8070 0x05 /* Removable media */ #define US_SC_SCSI 0x06 /* Transparent */ -#define US_SC_ISD200 0x07 /* ISD200 ATA */ -#define US_SC_MIN US_SC_RBC -#define US_SC_MAX US_SC_ISD200 +#define US_SC_LOCKABLE 0x07 /* Password-protected */ +#define US_SC_ISD200 0xf0 /* ISD200 ATA */ #define US_SC_DEVICE 0xff /* Use device's value */ /* Protocols */ |