Resolve USB driver identification conflict.
Reported by: Anish Mistry <amistry@am-productions.biz> MFC after: 1 week
This commit is contained in:
parent
7728b3d28c
commit
3d9b56b045
@ -170,15 +170,15 @@ static const struct usb_ether_methods urndis_ue_methods = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
static const STRUCT_USB_HOST_ID urndis_host_devs[] = {
|
static const STRUCT_USB_HOST_ID urndis_host_devs[] = {
|
||||||
#if 0
|
/* Generic RNDIS class match */
|
||||||
/* XXX this entry has a conflict an entry the umodem driver XXX */
|
|
||||||
{USB_IFACE_CLASS(UICLASS_CDC), USB_IFACE_SUBCLASS(UISUBCLASS_ABSTRACT_CONTROL_MODEL),
|
|
||||||
USB_IFACE_PROTOCOL(0xff)},
|
|
||||||
#endif
|
|
||||||
{USB_IFACE_CLASS(UICLASS_WIRELESS), USB_IFACE_SUBCLASS(UISUBCLASS_RF),
|
{USB_IFACE_CLASS(UICLASS_WIRELESS), USB_IFACE_SUBCLASS(UISUBCLASS_RF),
|
||||||
USB_IFACE_PROTOCOL(UIPROTO_RNDIS)},
|
USB_IFACE_PROTOCOL(UIPROTO_RNDIS)},
|
||||||
{USB_IFACE_CLASS(UICLASS_IAD), USB_IFACE_SUBCLASS(UISUBCLASS_SYNC),
|
{USB_IFACE_CLASS(UICLASS_IAD), USB_IFACE_SUBCLASS(UISUBCLASS_SYNC),
|
||||||
USB_IFACE_PROTOCOL(UIPROTO_ACTIVESYNC)},
|
USB_IFACE_PROTOCOL(UIPROTO_ACTIVESYNC)},
|
||||||
|
/* HP-WebOS */
|
||||||
|
{USB_VENDOR(USB_VENDOR_PALM), USB_IFACE_CLASS(UICLASS_CDC),
|
||||||
|
USB_IFACE_SUBCLASS(UISUBCLASS_ABSTRACT_CONTROL_MODEL),
|
||||||
|
USB_IFACE_PROTOCOL(0xff)},
|
||||||
};
|
};
|
||||||
|
|
||||||
static int
|
static int
|
||||||
|
@ -125,7 +125,7 @@ static const STRUCT_USB_HOST_ID umodem_devs[] = {
|
|||||||
USB_IFACE_SUBCLASS(UISUBCLASS_ABSTRACT_CONTROL_MODEL),
|
USB_IFACE_SUBCLASS(UISUBCLASS_ABSTRACT_CONTROL_MODEL),
|
||||||
USB_IFACE_PROTOCOL(UIPROTO_CDC_NONE)},
|
USB_IFACE_PROTOCOL(UIPROTO_CDC_NONE)},
|
||||||
/* Huawei Modem class match */
|
/* Huawei Modem class match */
|
||||||
{USB_IFACE_CLASS(UICLASS_CDC),
|
{USB_VENDOR(USB_VENDOR_HUAWEI),USB_IFACE_CLASS(UICLASS_CDC),
|
||||||
USB_IFACE_SUBCLASS(UISUBCLASS_ABSTRACT_CONTROL_MODEL),
|
USB_IFACE_SUBCLASS(UISUBCLASS_ABSTRACT_CONTROL_MODEL),
|
||||||
USB_IFACE_PROTOCOL(0xFF)},
|
USB_IFACE_PROTOCOL(0xFF)},
|
||||||
/* Kyocera AH-K3001V */
|
/* Kyocera AH-K3001V */
|
||||||
|
Loading…
x
Reference in New Issue
Block a user