From patchwork Mon Feb 8 13:16:39 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Colin Ian King X-Patchwork-Id: 44782 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 C3A5DB7CEE for ; Tue, 9 Feb 2010 00:16:51 +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 1NeTTr-0005Dz-Ei; Mon, 08 Feb 2010 13:16:47 +0000 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1NeTTn-0005Ab-IL for kernel-team@lists.ubuntu.com; Mon, 08 Feb 2010 13:16:43 +0000 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1NeTTn-00074Y-Gq for ; Mon, 08 Feb 2010 13:16:43 +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 1NeTTn-00057C-Be for kernel-team@lists.ubuntu.com; Mon, 08 Feb 2010 13:16:43 +0000 From: Colin King To: kernel-team@lists.ubuntu.com Subject: [PATCH 6/6] USB: usb-storage: unusual_devs entry for Nikon D2H Date: Mon, 8 Feb 2010 13:16:39 +0000 Message-Id: <1265634999-1717-7-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> MIME-Version: 1.0 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: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com From: Tobias Kunze Briseño This patch adds an unusual_devs entry for the Nikon D2H camera. From: Tobias Kunze Briseño , Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman (cherry picked from commit 621b239d75b790ac66854d46b094874f69e6776e) BugLink: http://bugs.launchpad.net/bugs/518750 Signed-off-by: Colin Ian King Acked-by: Stefan Bader --- drivers/usb/storage/unusual_devs.h | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h index 168be40..e8aebd9 100644 --- a/drivers/usb/storage/unusual_devs.h +++ b/drivers/usb/storage/unusual_devs.h @@ -335,6 +335,13 @@ UNUSUAL_DEV( 0x04b0, 0x0401, 0x0200, 0x0200, US_SC_DEVICE, US_PR_DEVICE, NULL, US_FL_FIX_CAPACITY), +/* Reported by Tobias Kunze Briseno */ +UNUSUAL_DEV( 0x04b0, 0x0403, 0x0200, 0x0200, + "NIKON", + "NIKON DSC D2H", + US_SC_DEVICE, US_PR_DEVICE, NULL, + US_FL_FIX_CAPACITY), + /* Reported by Milinevsky Dmitry */ UNUSUAL_DEV( 0x04b0, 0x0409, 0x0100, 0x0100, "NIKON",