Index: quirk/usb_quirk.c
===================================================================
--- quirk/usb_quirk.c	(revision 250365)
+++ quirk/usb_quirk.c	(working copy)
@@ -287,6 +287,8 @@
 	    UQ_MSC_NO_INQUIRY),
 	USB_QUIRK(NIKON, D300, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB,
 	    UQ_MSC_FORCE_PROTO_SCSI),
+	USB_QUIRK(NIKON, S3100, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB,
+	    UQ_MSC_FORCE_PROTO_SCSI),
 	USB_QUIRK(OLYMPUS, C1, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB,
 	    UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_WRONG_CSWSIG),
 	USB_QUIRK(OLYMPUS, C700, 0x0000, 0xffff, UQ_MSC_NO_GETMAXLUN),
Index: usbdevs
===================================================================
--- usbdevs	(revision 250365)
+++ usbdevs	(working copy)
@@ -3041,6 +3041,7 @@
 product NIKON E990		0x0102	Digital Camera E990
 product NIKON LS40		0x4000	CoolScan LS40 ED
 product NIKON D300		0x041a  Digital Camera D300
+product NIKON S3100		0x0320	Coolpix S3100 (ptp)
 
 /* NovaTech Products */
 product NOVATECH NV902		0x9020	NovaTech NV-902W