Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 506e9469 authored by Alan Stern's avatar Alan Stern Committed by Greg Kroah-Hartman
Browse files

USB: usb-storage: add Pentax to the bad-vendor list 



This patch (as1202) adds Pentax to usb-storage's list of bad vendors
whose devices always need the CAPACITY_HEURISTICS flag.  This is in
addition to the existing entries: Nokia, Nikon, and Motorola.

Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Tested-by: default avatarVirgo Pärna <virgo.parna@mail.ee>
Cc: stable <stable@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent e38c2874

drivers/usb/storage/scsiglue.c

+2 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ 
 */

#define VENDOR_ID_NOKIA		0x0421

#define VENDOR_ID_NIKON		0x04b0

#define VENDOR_ID_PENTAX	0x0a17

#define VENDOR_ID_MOTOROLA	0x22b8



/***********************************************************************
@@ -158,6 +159,7 @@ static int slave_configure(struct scsi_device *sdev) 
		switch (le16_to_cpu(us->pusb_dev->descriptor.idVendor)) {

		case VENDOR_ID_NOKIA:

		case VENDOR_ID_NIKON:

		case VENDOR_ID_PENTAX:

		case VENDOR_ID_MOTOROLA:

			if (!(us->fflags & (US_FL_FIX_CAPACITY |

					US_FL_CAPACITY_OK)))

drivers/usb/storage/unusual_devs.h

+0 −15
Original line number Diff line number Diff line
@@ -1354,21 +1354,6 @@ UNUSUAL_DEV( 0x0a17, 0x0004, 0x1000, 0x1000, 
		US_SC_DEVICE, US_PR_DEVICE, NULL,

		US_FL_FIX_INQUIRY ),





/* Submitted by Per Winkvist <per.winkvist@uk.com> */

UNUSUAL_DEV( 0x0a17, 0x006, 0x0000, 0xffff,

		"Pentax",

		"Optio S/S4",

		US_SC_DEVICE, US_PR_DEVICE, NULL,

		US_FL_FIX_INQUIRY ),



/* Reported by Jaak Ristioja <Ristioja@gmail.com> */

UNUSUAL_DEV( 0x0a17, 0x006e, 0x0100, 0x0100,

		"Pentax",

		"K10D",

		US_SC_DEVICE, US_PR_DEVICE, NULL,

		US_FL_FIX_CAPACITY ),



/* These are virtual windows driver CDs, which the zd1211rw driver

 * automatically converts into WLAN devices. */

UNUSUAL_DEV( 0x0ace, 0x2011, 0x0101, 0x0101,