| Message ID | 1265634999-1717-6-git-send-email-colin.king@canonical.com |
|---|---|
| State | Accepted |
| Delegated to: | Stefan Bader |
| Headers | show |
Colin King wrote: > From: Paul Ready <lxtwin@homecall.co.uk> > > Addresses http://bugzilla.kernel.org/show_bug.cgi?id=11685 > > When A Nikon D300 camera is connected to a system it is seen in > /proc/bus/pci/devices but is not accessible. > > This is seen in the above file: > > T: Bus=01 Lev=01 Prnt=01 Port=05 Cnt=03 Dev#= 11 Spd=480 MxCh= 0 > D: Ver= 2.00 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs= 1 > P: Vendor=04b0 ProdID=041a Rev= 1.03 > S: Manufacturer=NIKON > S: Product=NIKON DSC D300 > S: SerialNumber=000008014379 > C:* #Ifs= 1 Cfg#= 1 Atr=c0 MxPwr= 2mA > I:* If#= 0 Alt= 0 #EPs= 3 Cls=06(still) Sub=01 Prot=01 Driver=usbfs > E: Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms > E: Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms > E: Ad=83(I) Atr=03(Int.) MxPS= 8 Ivl=32ms > > Cc: Alan Stern <stern@rowland.harvard.edu> > Signed-off-by: Andrew Morton <akpm@linux-foundation.org> > Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> > > (cherry picked from commit 0047ca0a45c6a481abd467fb52d2a480ffc8c6b9) > > 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 b6af722..168be40 100644 > --- a/drivers/usb/storage/unusual_devs.h > +++ b/drivers/usb/storage/unusual_devs.h > @@ -391,6 +391,13 @@ UNUSUAL_DEV( 0x04b0, 0x0417, 0x0100, 0x0100, > US_SC_DEVICE, US_PR_DEVICE, NULL, > US_FL_FIX_CAPACITY), > > +/* Reported by paul ready <lxtwin@homecall.co.uk> */ > +UNUSUAL_DEV( 0x04b0, 0x0419, 0x0100, 0x0200, > + "NIKON", > + "NIKON DSC D300", > + US_SC_DEVICE, US_PR_DEVICE, NULL, > + US_FL_FIX_CAPACITY), > + > /* Reported by Doug Maxey (dwm@austin.ibm.com) */ > UNUSUAL_DEV( 0x04b3, 0x4001, 0x0110, 0x0110, > "IBM",
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h index b6af722..168be40 100644 --- a/drivers/usb/storage/unusual_devs.h +++ b/drivers/usb/storage/unusual_devs.h @@ -391,6 +391,13 @@ UNUSUAL_DEV( 0x04b0, 0x0417, 0x0100, 0x0100, US_SC_DEVICE, US_PR_DEVICE, NULL, US_FL_FIX_CAPACITY), +/* Reported by paul ready <lxtwin@homecall.co.uk> */ +UNUSUAL_DEV( 0x04b0, 0x0419, 0x0100, 0x0200, + "NIKON", + "NIKON DSC D300", + US_SC_DEVICE, US_PR_DEVICE, NULL, + US_FL_FIX_CAPACITY), + /* Reported by Doug Maxey (dwm@austin.ibm.com) */ UNUSUAL_DEV( 0x04b3, 0x4001, 0x0110, 0x0110, "IBM",