Skip to contentSkip to conversation

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

PATCH Applied Dave Jones 4 participants 7 messages Jul 4, 2008 – Jul 31, 2008

Subsystems (2)
lore
Share & tools
lore

Dave Jones

author
#0 lore raw

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.

drivers/usb/storage/unusual_devs.h +7 -0
index 45fe366..cf03af1 100644
@@ -364,6 +364,13 @@ UNUSUAL_DEV(  0x04b0, 0x0411, 0x0100, 0x0110,
 		US_SC_DEVICE, US_PR_DEVICE, NULL,
 		US_FL_FIX_CAPACITY),
 
+/* Reported by https://bugzilla.redhat.com/show_bug.cgi?id=454028 */
+UNUSUAL_DEV(  0x04b0, 0x0413, 0x0110, 0x0111,
+		"NIKON",
+		"NIKON DSC D40",
+		US_SC_DEVICE, US_PR_DEVICE, NULL,
+		US_FL_FIX_CAPACITY),
+
 /* Reported by Ortwin Glueck <[email protected]> */
 UNUSUAL_DEV(  0x04b0, 0x0413, 0x0110, 0x0110,
 		"NIKON",
Signature · 1 line
http://www.codemonkey.org.uk
#1 lore raw

NAK.

Two entries should not have overlapping version ranges, unless configuration options are involved.

Why not just extend the range of the existing entry?

Matt

Quoted 34 lines · Dave Jones

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.

drivers/usb/storage/unusual_devs.h +7 -0
index 45fe366..cf03af1 100644
@@ -364,6 +364,13 @@ UNUSUAL_DEV(  0x04b0, 0x0411, 0x0100, 0x0110,
 		US_SC_DEVICE, US_PR_DEVICE, NULL,
 		US_FL_FIX_CAPACITY),
 
+/* Reported by https://bugzilla.redhat.com/show_bug.cgi?id=454028 */
+UNUSUAL_DEV(  0x04b0, 0x0413, 0x0110, 0x0111,
+		"NIKON",
+		"NIKON DSC D40",
+		US_SC_DEVICE, US_PR_DEVICE, NULL,
+		US_FL_FIX_CAPACITY),
+
 /* Reported by Ortwin Glueck <[email protected]> */
 UNUSUAL_DEV(  0x04b0, 0x0413, 0x0110, 0x0110,
 		"NIKON",
Signature · 6 lines
-- 
http://www.codemonkey.org.uk
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Signature · 7 lines
Matthew Dharm                              Home: [email protected] 
Maintainer, Linux USB Mass Storage Driver

P:  How about "Web Designer"?
DP: I'd like a name that people won't laugh at.
					-- Pitr and Dust Puppy
User Friendly, 12/6/1997
author
#2 lore raw

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.

drivers/usb/storage/unusual_devs.h +1 -1
index 39a7c11..1a497e9 100644
@@ -358,7 +358,7 @@ UNUSUAL_DEV(  0x04b0, 0x040f, 0x0100, 0x0200,
 		US_FL_FIX_CAPACITY),
 
 /* Reported by Emil Larsson <[email protected]> */
-UNUSUAL_DEV(  0x04b0, 0x0411, 0x0100, 0x0110,
+UNUSUAL_DEV(  0x04b0, 0x0411, 0x0100, 0x0111,
 		"NIKON",
 		"NIKON DSC D80",
 		US_SC_DEVICE, US_PR_DEVICE, NULL,
Signature · 1 line
http://www.codemonkey.org.uk
maintainer
#3 lore raw
Quoted 1 line · Dave Jones

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

...

drivers/usb/storage/unusual_devs.h UNUSUAL_DEV( 0x04b0, 0x040f, 0x0100, 0x0200, · line 363

Quoted 4 lines
drivers/usb/storage/unusual_devs.h +1 -1
-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?

Alan Stern

author
#4 lore raw
Quoted 10 lines · Alan Stern
Quoted 1 line · Dave Jones

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

...

drivers/usb/storage/unusual_devs.h UNUSUAL_DEV( 0x04b0, 0x040f, 0x0100, 0x0200, · line 363

Quoted 4 lines
drivers/usb/storage/unusual_devs.h +1 -1
-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.

argh.

Quoted 1 line

Maybe they both need to be updated?

Maybe. I'm not familiar with how similar the firmware is between those two cameras. The version numbering would certainly suggest that is the case, but should we take a chance and guess, or wait until a user complains?

Dave

Signature · 1 line
http://www.codemonkey.org.uk
author
#5 lore raw
In reply to Alan Stern
Quoted 11 lines · Alan Stern
Quoted 1 line · Dave Jones

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

...

Review

Quoted 4 lines
(quoted diff) +1 -1
-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.

drivers/usb/storage/unusual_devs.h +2 -2
index 39a7c11..c0b9d10 100644
@@ -358,14 +358,14 @@ UNUSUAL_DEV(  0x04b0, 0x040f, 0x0100, 0x0200,
 		US_FL_FIX_CAPACITY),
 
 /* Reported by Emil Larsson <[email protected]> */
-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 <[email protected]> */
-UNUSUAL_DEV(  0x04b0, 0x0413, 0x0110, 0x0110,
+UNUSUAL_DEV(  0x04b0, 0x0413, 0x0110, 0x0111,
 		"NIKON",
 		"NIKON DSC D40",
 		US_SC_DEVICE, US_PR_DEVICE, NULL,
Signature · 1 line
http://www.codemonkey.org.uk
#6 lore raw

patch usb-usb-storage-quirk-around-v1.11-firmware-on-nikon-d4.patch added to gregkh-2.6 tree

This is a note to let you know that I've just added the patch titled

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

to my gregkh-2.6 tree. Its filename is

usb-usb-storage-quirk-around-v1.11-firmware-on-nikon-d4.patch

This tree can be found at
http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/patches/

Quoted 1 line

From [email protected] Thu Jul 31 10:32:27 2008

From: Dave Jones <[email protected]>
Date: Mon, 14 Jul 2008 13:28:34 -0400
Subject: USB: usb-storage: quirk around v1.11 firmware on Nikon D4
To: Alan Stern <[email protected]>
Cc: Linux Kernel <[email protected]>, [email protected], [email protected]
Message-ID: <[email protected]>
Content-Disposition: inline

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.

---
 drivers/usb/storage/unusual_devs.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/usb/storage/unusual_devs.h +2 -2
@@ -356,14 +356,14 @@ UNUSUAL_DEV(  0x04b0, 0x040f, 0x0100, 0x
 		US_FL_FIX_CAPACITY),
 
 /* Reported by Emil Larsson <[email protected]> */
-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 <[email protected]> */
-UNUSUAL_DEV(  0x04b0, 0x0413, 0x0110, 0x0110,
+UNUSUAL_DEV(  0x04b0, 0x0413, 0x0110, 0x0111,
 		"NIKON",
 		"NIKON DSC D40",
 		US_SC_DEVICE, US_PR_DEVICE, NULL,

Patches currently in gregkh-2.6 which might be from [email protected] are

bad/pci-dynamic-id-cleanup.patch bad/pci-two-drivers-on-one-pci-device.patch usb.current/usb-usb-storage-quirk-around-v1.11-firmware-on-nikon-d4.patch