From: Jeremy Katz Date: Thu, 19 Jul 2007 13:37:42 +0000 (-0400) Subject: USB: Don't let usb-storage steal Blackberry Pearl X-Git-Tag: v2.6.23-rc2~151^2~17 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c17b49ec31fea27c1dad8a224f5aaa1897519e37;p=linux-2.6 USB: Don't let usb-storage steal Blackberry Pearl The Blackberry Pearl can run in two modes; a usb-storage only mode and a mode that allows access via mass storage and to its database. The berry_charge module will set the device to dual mode and thus we should ignore its native mode if that module is built Signed-off-by: Jeremy Katz Signed-off-by: Phil Dibowitz Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h index a624e72f81..da08fcd79d 100644 --- a/drivers/usb/storage/unusual_devs.h +++ b/drivers/usb/storage/unusual_devs.h @@ -1357,6 +1357,20 @@ UNUSUAL_DEV( 0x0f19, 0x0105, 0x0100, 0x0100, US_SC_DEVICE, US_PR_DEVICE, NULL, US_FL_IGNORE_RESIDUE ), +/* Jeremy Katz : + * The Blackberry Pearl can run in two modes; a usb-storage only mode + * and a mode that allows access via mass storage and to its database. + * The berry_charge module will set the device to dual mode and thus we + * should ignore its native mode if that module is built + */ +#ifdef CONFIG_USB_BERRY_CHARGE +UNUSUAL_DEV( 0x0fca, 0x0006, 0x0001, 0x0001, + "RIM", + "Blackberry Pearl", + US_SC_DEVICE, US_PR_DEVICE, NULL, + US_FL_IGNORE_DEVICE ), +#endif + /* Reported by Michael Stattmann */ UNUSUAL_DEV( 0x0fce, 0xd008, 0x0000, 0x0000, "Sony Ericsson",