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 <katzj@redhat.com> Signed-off-by: Phil Dibowitz <phil@ipom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
1aebb781e3
commit
c17b49ec31
|
@ -1357,6 +1357,20 @@ UNUSUAL_DEV( 0x0f19, 0x0105, 0x0100, 0x0100,
|
|||
US_SC_DEVICE, US_PR_DEVICE, NULL,
|
||||
US_FL_IGNORE_RESIDUE ),
|
||||
|
||||
/* Jeremy Katz <katzj@redhat.com>:
|
||||
* 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 <michael@stattmann.com> */
|
||||
UNUSUAL_DEV( 0x0fce, 0xd008, 0x0000, 0x0000,
|
||||
"Sony Ericsson",
|
||||
|
|
Loading…
Reference in a new issue