Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756648AbYGNRfb (ORCPT ); Mon, 14 Jul 2008 13:35:31 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753888AbYGNRfW (ORCPT ); Mon, 14 Jul 2008 13:35:22 -0400 Received: from mx1.redhat.com ([66.187.233.31]:35674 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753226AbYGNRfV (ORCPT ); Mon, 14 Jul 2008 13:35:21 -0400 Date: Mon, 14 Jul 2008 13:28:34 -0400 From: Dave Jones To: Alan Stern Cc: Linux Kernel , linux-usb@vger.kernel.org, gregkh@suse.de Subject: Re: usb-storage: quirk around v1.11 firmware on Nikon D4 Message-ID: <20080714172834.GA23016@redhat.com> Mail-Followup-To: Dave Jones , Alan Stern , Linux Kernel , linux-usb@vger.kernel.org, gregkh@suse.de References: <20080704195940.GA17510@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1786 Lines: 53 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 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 */ -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 */ -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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/