Patchwork [4/6] USB: Unusual dev for the "Kyocera / Contax SL300R T*" digital camera.

login
register
mail settings
Submitter Colin King
Date Feb. 8, 2010, 1:16 p.m.
Message ID <1265634999-1717-5-git-send-email-colin.king@canonical.com>
Download mbox | patch
Permalink /patch/44777/
State Accepted
Delegated to: Stefan Bader
Headers show

Comments

Colin King - Feb. 8, 2010, 1:16 p.m.
From: Jens Taprogge <jens.taprogge@taprogge.org>

The camera reports an incorrect size and fails to handle PREVENT-ALLOW
MEDIUM REMOVAL commands.  The patch marks the camera as an unusual dev
and adds the flags to enable the workarounds for both shortcomings.

Signed-off-by: Jens Taprogge <jens.taprogge@taprogge.org>
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: Phil Dibowitz <phil@ipom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

(cherry picked from commit 74511bb340059be5a3fceb032213c7f325344694)

BugLink: http://bugs.launchpad.net/bugs/518750
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 drivers/usb/storage/unusual_devs.h |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)
Stefan Bader - Feb. 8, 2010, 7:07 p.m.
Colin King wrote:
> From: Jens Taprogge <jens.taprogge@taprogge.org>
> 
> The camera reports an incorrect size and fails to handle PREVENT-ALLOW
> MEDIUM REMOVAL commands.  The patch marks the camera as an unusual dev
> and adds the flags to enable the workarounds for both shortcomings.
> 
> Signed-off-by: Jens Taprogge <jens.taprogge@taprogge.org>
> Cc: Alan Stern <stern@rowland.harvard.edu>
> Cc: Phil Dibowitz <phil@ipom.com>
> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
> 
> (cherry picked from commit 74511bb340059be5a3fceb032213c7f325344694)
> 
> BugLink: http://bugs.launchpad.net/bugs/518750
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
> ---
>  drivers/usb/storage/unusual_devs.h |    7 +++++++
>  1 files changed, 7 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
> index 566451e..b6af722 100644
> --- a/drivers/usb/storage/unusual_devs.h
> +++ b/drivers/usb/storage/unusual_devs.h
> @@ -306,6 +306,13 @@ UNUSUAL_DEV(  0x0482, 0x0103, 0x0100, 0x0100,
>  		"Finecam S5",
>  		US_SC_DEVICE, US_PR_DEVICE, NULL, US_FL_FIX_INQUIRY),
>  
> +/* Patch submitted by Jens Taprogge <jens.taprogge@taprogge.org> */
> +UNUSUAL_DEV(  0x0482, 0x0107, 0x0100, 0x0100,
> +		"Kyocera",
> +		"CONTAX SL300R T*",
> +		US_SC_DEVICE, US_PR_DEVICE, NULL,
> +		US_FL_FIX_CAPACITY | US_FL_NOT_LOCKABLE),
> +
>  /* Reported by Paul Stewart <stewart@wetlogic.net>
>   * This entry is needed because the device reports Sub=ff */
>  UNUSUAL_DEV(  0x04a4, 0x0004, 0x0001, 0x0001,

Patch

diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index 566451e..b6af722 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -306,6 +306,13 @@  UNUSUAL_DEV(  0x0482, 0x0103, 0x0100, 0x0100,
 		"Finecam S5",
 		US_SC_DEVICE, US_PR_DEVICE, NULL, US_FL_FIX_INQUIRY),
 
+/* Patch submitted by Jens Taprogge <jens.taprogge@taprogge.org> */
+UNUSUAL_DEV(  0x0482, 0x0107, 0x0100, 0x0100,
+		"Kyocera",
+		"CONTAX SL300R T*",
+		US_SC_DEVICE, US_PR_DEVICE, NULL,
+		US_FL_FIX_CAPACITY | US_FL_NOT_LOCKABLE),
+
 /* Reported by Paul Stewart <stewart@wetlogic.net>
  * This entry is needed because the device reports Sub=ff */
 UNUSUAL_DEV(  0x04a4, 0x0004, 0x0001, 0x0001,