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.
Signed-off-by: Dave Jones <[email protected]>
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index 45fe366..cf03af1 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -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",
--
http://www.codemonkey.org.uk
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
On Fri, Jul 04, 2008 at 03:33:23PM -0400, Dave Jones wrote:
> 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.
>
> Signed-off-by: Dave Jones <[email protected]>
>
> diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
> index 45fe366..cf03af1 100644
> --- a/drivers/usb/storage/unusual_devs.h
> +++ b/drivers/usb/storage/unusual_devs.h
> @@ -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",
>
>
> --
> 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
--
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
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.
Signed-off-by: Dave Jones <[email protected]>
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index 39a7c11..1a497e9 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -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,
--
http://www.codemonkey.org.uk
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?
Alan Stern
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.
argh.
> 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
--
http://www.codemonkey.org.uk
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 <[email protected]>
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 <[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,
--
http://www.codemonkey.org.uk
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/
>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.
Signed-off-by: Dave Jones <[email protected]>
Cc: Johannes Berg <[email protected]>
Cc: Alan Stern <[email protected]>
Cc: stable <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
drivers/usb/storage/unusual_devs.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -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