Patchwork [3/6] USB: usb-storage: quirk around v1.11 firmware on Nikon D4

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

Comments

Colin King - Feb. 8, 2010, 1:16 p.m.
From: Dave Jones <davej@redhat.com>

usb-storage: quirk around v1.11 firmware on Nikon D40

https://bugzilla.redhat.com/show_bug.cgi?id=454028
Just as in earlier firmware versions, we need to perform this
quirk for the latest version too.

Speculatively do the entry for the D80 too, as they seem to
have the same firmware problems historically.

Signed-off-by: Dave Jones <davej@redhat.com>
Cc: Johannes Berg <johannes@sipsolutions.net>
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

(cherry picked from commit b9a097f26e55968cbc52e30a4a2e73d32d7604ce)

BugLink: http://bugs.launchpad.net/bugs/518750
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 drivers/usb/storage/unusual_devs.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
Stefan Bader - Feb. 8, 2010, 7:06 p.m.
Colin King wrote:
> From: Dave Jones <davej@redhat.com>
> 
> usb-storage: quirk around v1.11 firmware on Nikon D40
> 
> https://bugzilla.redhat.com/show_bug.cgi?id=454028
> Just as in earlier firmware versions, we need to perform this
> quirk for the latest version too.
> 
> Speculatively do the entry for the D80 too, as they seem to
> have the same firmware problems historically.
> 
> Signed-off-by: Dave Jones <davej@redhat.com>
> Cc: Johannes Berg <johannes@sipsolutions.net>
> Cc: Alan Stern <stern@rowland.harvard.edu>
> Cc: stable <stable@kernel.org>
> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
> 
> (cherry picked from commit b9a097f26e55968cbc52e30a4a2e73d32d7604ce)
> 
> BugLink: http://bugs.launchpad.net/bugs/518750
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
Acked-by: Stefan Bader <stefan.bader@caonical.com>
> ---
>  drivers/usb/storage/unusual_devs.h |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
> index b1e4d9e..566451e 100644
> --- a/drivers/usb/storage/unusual_devs.h
> +++ b/drivers/usb/storage/unusual_devs.h
> @@ -357,14 +357,14 @@ UNUSUAL_DEV(  0x04b0, 0x040f, 0x0100, 0x0200,
>  		US_FL_FIX_CAPACITY),
>  
>  /* Reported by Emil Larsson <emil@swip.net> */
> -UNUSUAL_DEV(  0x04b0, 0x0411, 0x0100, 0x0110,
> +UNUSUAL_DEV(  0x04b0, 0x0411, 0x0100, 0x0111,
>  		"NIKON",
>  		"NIKON DSC D80",
>  		US_SC_DEVICE, US_PR_DEVICE, NULL,
>  		US_FL_FIX_CAPACITY),
>  
>  /* Reported by Ortwin Glueck <odi@odi.ch> */
> -UNUSUAL_DEV(  0x04b0, 0x0413, 0x0110, 0x0110,
> +UNUSUAL_DEV(  0x04b0, 0x0413, 0x0110, 0x0111,
>  		"NIKON",
>  		"NIKON DSC D40",
>  		US_SC_DEVICE, US_PR_DEVICE, NULL,

Patch

diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index b1e4d9e..566451e 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -357,14 +357,14 @@  UNUSUAL_DEV(  0x04b0, 0x040f, 0x0100, 0x0200,
 		US_FL_FIX_CAPACITY),
 
 /* Reported by Emil Larsson <emil@swip.net> */
-UNUSUAL_DEV(  0x04b0, 0x0411, 0x0100, 0x0110,
+UNUSUAL_DEV(  0x04b0, 0x0411, 0x0100, 0x0111,
 		"NIKON",
 		"NIKON DSC D80",
 		US_SC_DEVICE, US_PR_DEVICE, NULL,
 		US_FL_FIX_CAPACITY),
 
 /* Reported by Ortwin Glueck <odi@odi.ch> */
-UNUSUAL_DEV(  0x04b0, 0x0413, 0x0110, 0x0110,
+UNUSUAL_DEV(  0x04b0, 0x0413, 0x0110, 0x0111,
 		"NIKON",
 		"NIKON DSC D40",
 		US_SC_DEVICE, US_PR_DEVICE, NULL,