diff options
Diffstat (limited to 'drivers/usb/storage/scsiglue.c')
-rw-r--r-- | drivers/usb/storage/scsiglue.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/storage/scsiglue.c b/drivers/usb/storage/scsiglue.c index 2a42b862aa9..727c506417c 100644 --- a/drivers/usb/storage/scsiglue.c +++ b/drivers/usb/storage/scsiglue.c | |||
@@ -64,6 +64,7 @@ | |||
64 | */ | 64 | */ |
65 | #define VENDOR_ID_NOKIA 0x0421 | 65 | #define VENDOR_ID_NOKIA 0x0421 |
66 | #define VENDOR_ID_NIKON 0x04b0 | 66 | #define VENDOR_ID_NIKON 0x04b0 |
67 | #define VENDOR_ID_PENTAX 0x0a17 | ||
67 | #define VENDOR_ID_MOTOROLA 0x22b8 | 68 | #define VENDOR_ID_MOTOROLA 0x22b8 |
68 | 69 | ||
69 | /*********************************************************************** | 70 | /*********************************************************************** |
@@ -158,6 +159,7 @@ static int slave_configure(struct scsi_device *sdev) | |||
158 | switch (le16_to_cpu(us->pusb_dev->descriptor.idVendor)) { | 159 | switch (le16_to_cpu(us->pusb_dev->descriptor.idVendor)) { |
159 | case VENDOR_ID_NOKIA: | 160 | case VENDOR_ID_NOKIA: |
160 | case VENDOR_ID_NIKON: | 161 | case VENDOR_ID_NIKON: |
162 | case VENDOR_ID_PENTAX: | ||
161 | case VENDOR_ID_MOTOROLA: | 163 | case VENDOR_ID_MOTOROLA: |
162 | if (!(us->fflags & (US_FL_FIX_CAPACITY | | 164 | if (!(us->fflags & (US_FL_FIX_CAPACITY | |
163 | US_FL_CAPACITY_OK))) | 165 | US_FL_CAPACITY_OK))) |