From patchwork Mon Feb 8 13:16:34 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin Ian King X-Patchwork-Id: 44778 X-Patchwork-Delegate: stefan.bader@canonical.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id E6865B7D12 for ; Tue, 9 Feb 2010 00:16:49 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1NeTTn-0005Aa-MW; Mon, 08 Feb 2010 13:16:43 +0000 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1NeTTk-00059t-RP for kernel-team@lists.ubuntu.com; Mon, 08 Feb 2010 13:16:40 +0000 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1NeTTk-00071e-QC for ; Mon, 08 Feb 2010 13:16:40 +0000 Received: from cpc2-craw3-0-0-cust718.croy.cable.virginmedia.com ([82.44.34.207] helo=localhost) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.69) (envelope-from ) id 1NeTTk-00056x-LO for kernel-team@lists.ubuntu.com; Mon, 08 Feb 2010 13:16:40 +0000 From: Colin King To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/6] USB: storage: Nikon D80 new FW still needs Fixup Date: Mon, 8 Feb 2010 13:16:34 +0000 Message-Id: <1265634999-1717-2-git-send-email-colin.king@canonical.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1265634999-1717-1-git-send-email-colin.king@canonical.com> References: <1265634999-1717-1-git-send-email-colin.king@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com From: Konstantin Kletschke Add new BCD numbers for Nikon D80 Firmware revision v1.10 to the unusual_devs.h file. Signed-off-by: Konstantin Kletschke Signed-off-by: Phil Dibowitz Signed-off-by: Greg Kroah-Hartman (cherry picked from commit 9232951ada7ec2f2c1424e4c024dc8540ae97e91) BugLink: http://bugs.launchpad.net/bugs/518750 Signed-off-by: Colin Ian King Acked-by: Stefan Bader --- 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 */ -UNUSUAL_DEV( 0x04b0, 0x0411, 0x0100, 0x0101, +UNUSUAL_DEV( 0x04b0, 0x0411, 0x0100, 0x0110, "NIKON", "NIKON DSC D80", US_SC_DEVICE, US_PR_DEVICE, NULL,