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

[Dave Jones <davej@redhat.com>]

On Fri, Jul 04, 2008 at 06:09:25PM -0400, Alan Stern wrote:
 > On Fri, 4 Jul 2008, Dave Jones wrote:
 > 
 > > usb-storage: quirk around v1.11 firmware on Nikon D40
 > ...
 > > -UNUSUAL_DEV(  0x04b0, 0x0411, 0x0100, 0x0110,
 > > +UNUSUAL_DEV(  0x04b0, 0x0411, 0x0100, 0x0111,
 > >  		"NIKON",
 > >  		"NIKON DSC D80",
 > 
 > You updated the entry for the D80, not the D40.  Maybe they both need 
 > to be updated?

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>

diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index 39a7c11..c0b9d10 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -358,14 +358,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,

-- 
http://www.codemonkey.org.uk