aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/storage
diff options
context:
space:
mode:
authorPaul Ready <lxtwin@homecall.co.uk>2008-10-29 17:25:50 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2008-11-13 17:45:00 -0500
commit0047ca0a45c6a481abd467fb52d2a480ffc8c6b9 (patch)
treee3908bc5cc759553180e7fc1216164e0cbdad053 /drivers/usb/storage
parent6c5ab376b0b579cf58f9217dcd7a94d817f7a043 (diff)
USB: add Nikon D300 camera to unusual_devs
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>
Diffstat (limited to 'drivers/usb/storage')
-rw-r--r--drivers/usb/storage/unusual_devs.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index fb9e20e624c1..f379291d5387 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -418,6 +418,13 @@ UNUSUAL_DEV( 0x04b0, 0x0417, 0x0100, 0x0100,
418 US_SC_DEVICE, US_PR_DEVICE, NULL, 418 US_SC_DEVICE, US_PR_DEVICE, NULL,
419 US_FL_FIX_CAPACITY), 419 US_FL_FIX_CAPACITY),
420 420
421/* Reported by paul ready <lxtwin@homecall.co.uk> */
422UNUSUAL_DEV( 0x04b0, 0x0419, 0x0100, 0x0200,
423 "NIKON",
424 "NIKON DSC D300",
425 US_SC_DEVICE, US_PR_DEVICE, NULL,
426 US_FL_FIX_CAPACITY),
427
421/* Reported by Doug Maxey (dwm@austin.ibm.com) */ 428/* Reported by Doug Maxey (dwm@austin.ibm.com) */
422UNUSUAL_DEV( 0x04b3, 0x4001, 0x0110, 0x0110, 429UNUSUAL_DEV( 0x04b3, 0x4001, 0x0110, 0x0110,
423 "IBM", 430 "IBM",