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

Commit cc36bdd4 authored by Constantin Baranov's avatar Constantin Baranov Committed by Greg Kroah-Hartman
Browse files

USB: add support for Motorola ROKR Z6 cellphone in mass storage mode 



Motorola ROKR Z6 cellphone has bugs in its USB, so it is impossible to use
it as mass storage. Patch describes new "unusual" USB device for it with
FIX_INQUIRY and FIX_CAPACITY flags and new BULK_IGNORE_TAG flag.
Last flag relaxes check for equality of bcs->Tag and us->tag in
usb_stor_Bulk_transport routine.

Signed-off-by: default avatarConstantin Baranov <const@tltsu.ru>
Signed-off-by: default avatarMatthew Dharm <mdharm-usb@one-eyed-alien.net>
Signed-off-by: default avatarDaniel Drake <dsd@gentoo.org>
Cc: stable <stable@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent ba2ef3b3

drivers/usb/storage/transport.c

+2 −1
Original line number Diff line number Diff line
@@ -1009,7 +1009,8 @@ int usb_stor_Bulk_transport(struct scsi_cmnd *srb, struct us_data *us) 
	US_DEBUGP("Bulk Status S 0x%x T 0x%x R %u Stat 0x%x\n",

			le32_to_cpu(bcs->Signature), bcs->Tag, 

			residue, bcs->Status);

	if (bcs->Tag != us->tag || bcs->Status > US_BULK_STAT_PHASE) {

	if (!(bcs->Tag == us->tag || (us->flags & US_FL_BULK_IGNORE_TAG)) ||

		bcs->Status > US_BULK_STAT_PHASE) {

		US_DEBUGP("Bulk logical error\n");

		return USB_STOR_TRANSPORT_ERROR;

	}

drivers/usb/storage/unusual_devs.h

+11 −0
Original line number Diff line number Diff line
@@ -1589,6 +1589,17 @@ UNUSUAL_DEV( 0x22b8, 0x4810, 0x0001, 0x0001, 
		US_SC_DEVICE, US_PR_DEVICE, NULL,

		US_FL_FIX_CAPACITY),



/*

 * Patch by Constantin Baranov <const@tltsu.ru>

 * Report by Andreas Koenecke.

 * Motorola ROKR Z6.

 */

UNUSUAL_DEV(  0x22b8, 0x6426, 0x0101, 0x0101,

		"Motorola",

		"MSnc.",

		US_SC_DEVICE, US_PR_DEVICE, NULL,

		US_FL_FIX_INQUIRY | US_FL_FIX_CAPACITY | US_FL_BULK_IGNORE_TAG),



/* Reported by Radovan Garabik <garabik@kassiopeia.juls.savba.sk> */

UNUSUAL_DEV(  0x2735, 0x100b, 0x0000, 0x9999,

		"MPIO",

include/linux/usb_usual.h

+3 −1
Original line number Diff line number Diff line
@@ -50,7 +50,9 @@ 
	US_FLAG(CAPACITY_HEURISTICS,	0x00001000)		\

		/* sometimes sizes is too big */		\

	US_FLAG(MAX_SECTORS_MIN,0x00002000)			\

		/* Sets max_sectors to arch min */

		/* Sets max_sectors to arch min */		\

	US_FLAG(BULK_IGNORE_TAG,0x00004000)			\

		/* Ignore tag mismatch in bulk operations */





#define US_FLAG(name, value)	US_FL_##name = value ,