Patchwork [1/6] USB: storage: Nikon D80 new FW still needs Fixup

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

Comments

Colin King - Feb. 8, 2010, 1:16 p.m.
From: Konstantin Kletschke <konsti@ku-gbr.de>

Add new BCD numbers for Nikon D80 Firmware revision v1.10 to the
unusual_devs.h file.

Signed-off-by: Konstantin Kletschke <konsti@ku-gbr.de>
Signed-off-by: Phil Dibowitz <phil@ipom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

(cherry picked from commit 9232951ada7ec2f2c1424e4c024dc8540ae97e91)

BugLink: http://bugs.launchpad.net/bugs/518750
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 drivers/usb/storage/unusual_devs.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Stefan Bader - Feb. 8, 2010, 7:03 p.m.
Sounds reasonable for master as well as lpia.

Colin King wrote:
> From: Konstantin Kletschke <konsti@ku-gbr.de>
> 
> Add new BCD numbers for Nikon D80 Firmware revision v1.10 to the
> unusual_devs.h file.
> 
> Signed-off-by: Konstantin Kletschke <konsti@ku-gbr.de>
> Signed-off-by: Phil Dibowitz <phil@ipom.com>
> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
> 
> (cherry picked from commit 9232951ada7ec2f2c1424e4c024dc8540ae97e91)
> 
> 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 |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
> index 759e740..c41a6f5 100644
> --- a/drivers/usb/storage/unusual_devs.h
> +++ b/drivers/usb/storage/unusual_devs.h
> @@ -357,7 +357,7 @@ UNUSUAL_DEV(  0x04b0, 0x040f, 0x0100, 0x0200,
>  		US_FL_FIX_CAPACITY),
>  
>  /* Reported by Emil Larsson <emil@swip.net> */
> -UNUSUAL_DEV(  0x04b0, 0x0411, 0x0100, 0x0101,
> +UNUSUAL_DEV(  0x04b0, 0x0411, 0x0100, 0x0110,
>  		"NIKON",
>  		"NIKON DSC D80",
>  		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 759e740..c41a6f5 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -357,7 +357,7 @@  UNUSUAL_DEV(  0x04b0, 0x040f, 0x0100, 0x0200,
 		US_FL_FIX_CAPACITY),
 
 /* Reported by Emil Larsson <emil@swip.net> */
-UNUSUAL_DEV(  0x04b0, 0x0411, 0x0100, 0x0101,
+UNUSUAL_DEV(  0x04b0, 0x0411, 0x0100, 0x0110,
 		"NIKON",
 		"NIKON DSC D80",
 		US_SC_DEVICE, US_PR_DEVICE, NULL,