aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/storage
diff options
context:
space:
mode:
authorAlan Stern <stern@rowland.harvard.edu>2011-01-03 16:47:49 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2011-01-22 18:32:17 -0800
commit12f68c480c7155a66bd2a76ab2fef28dd5f93fa2 (patch)
treea5c1327c29fe7dab424b4f56f89e9f5dd842df99 /drivers/usb/storage
parent9926c0df7b31b2128eebe92e0e2b052f380ea464 (diff)
downloadkernel_samsung_smdk4412-12f68c480c7155a66bd2a76ab2fef28dd5f93fa2.zip
kernel_samsung_smdk4412-12f68c480c7155a66bd2a76ab2fef28dd5f93fa2.tar.gz
kernel_samsung_smdk4412-12f68c480c7155a66bd2a76ab2fef28dd5f93fa2.tar.bz2
USB: usb-storage: unusual_devs entry for CamSport Evo
This patch (as1438) adds an unusual_devs entry for the MagicPixel FW_Omega2 chip, used in the CamSport Evo camera. The firmware incorrectly reports a vendor-specific bDeviceClass. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Reported-by: <ttkspam@free.fr> Cc: stable <stable@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/storage')
-rw-r--r--drivers/usb/storage/unusual_devs.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index 2e630e6..24bd5d7 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -1044,6 +1044,15 @@ UNUSUAL_DEV( 0x084d, 0x0011, 0x0110, 0x0110,
USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_BULK32),
+/* Reported by <ttkspam@free.fr>
+ * The device reports a vendor-specific device class, requiring an
+ * explicit vendor/product match.
+ */
+UNUSUAL_DEV( 0x0851, 0x1542, 0x0002, 0x0002,
+ "MagicPixel",
+ "FW_Omega2",
+ USB_SC_DEVICE, USB_PR_DEVICE, NULL, 0),
+
/* Andrew Lunn <andrew@lunn.ch>
* PanDigital Digital Picture Frame. Does not like ALLOW_MEDIUM_REMOVAL
* on LUN 4.