Message ID | 1265634999-1717-7-git-send-email-colin.king@canonical.com |
---|---|
State | Accepted |
Delegated to: | Stefan Bader |
Headers | show |
Colin King wrote: > From: Tobias Kunze Briseño <t@fictive.com> > > This patch adds an unusual_devs entry for the Nikon D2H camera. > > From: Tobias Kunze Briseño <t@fictive.com>, > Signed-off-by: Alan Stern <stern@rowland.harvard.edu> > Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> > > (cherry picked from commit 621b239d75b790ac66854d46b094874f69e6776e) > > BugLink: http://bugs.launchpad.net/bugs/518750 > Signed-off-by: Colin Ian King <colin.king@canonical.com> Acked-by: Stefan Bader <stefan.bader@canonical.com> > --- > 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 <t-linux@fictive.com> */ > +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 <niam.niam@gmail.com> */ > UNUSUAL_DEV( 0x04b0, 0x0409, 0x0100, 0x0100, > "NIKON",
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 <t-linux@fictive.com> */ +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 <niam.niam@gmail.com> */ UNUSUAL_DEV( 0x04b0, 0x0409, 0x0100, 0x0100, "NIKON",