Re: [ 46/69] USB: cdc-wdm: Add Vodafone/Huawei K5005 support

From: BjÃrn Mork
Date: Sun Jun 17 2012 - 16:51:03 EST


Ben Hutchings <ben@xxxxxxxxxxxxxxx> writes:

> 3.2-stable review patch. If anyone has any objections, please let me know.
>
> ------------------
>
> From: BjÃrn Mork <bjorn@xxxxxxx>
>
> commit de102ef41f24a4c251c4a3838796bb27557d4d93 upstream.
>
> Tested-by: Thomas SchÃfer <tschaefer@xxxxxxxxxxx>
> Signed-off-by: BjÃrn Mork <bjorn@xxxxxxx>
> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
> Signed-off-by: Ben Hutchings <ben@xxxxxxxxxxxxxxx>
> ---
> drivers/usb/class/cdc-wdm.c | 9 +++++++++
> 1 file changed, 9 insertions(+)
>
> diff --git a/drivers/usb/class/cdc-wdm.c b/drivers/usb/class/cdc-wdm.c
> index ea8b304..8fd398d 100644
> --- a/drivers/usb/class/cdc-wdm.c
> +++ b/drivers/usb/class/cdc-wdm.c
> @@ -55,6 +55,15 @@ static const struct usb_device_id wdm_ids[] = {
> .bInterfaceSubClass = 1,
> .bInterfaceProtocol = 9, /* NOTE: CDC ECM control interface! */
> },
> + {
> + /* Vodafone/Huawei K5005 (12d1:14c8) and similar modems */
> + .match_flags = USB_DEVICE_ID_MATCH_VENDOR |
> + USB_DEVICE_ID_MATCH_INT_INFO,
> + .idVendor = HUAWEI_VENDOR_ID,
> + .bInterfaceClass = USB_CLASS_VENDOR_SPEC,
> + .bInterfaceSubClass = 1,
> + .bInterfaceProtocol = 57, /* NOTE: CDC ECM control interface! */
> + },
> { }
> };


This interface is half of a control+data interface set being handled by
the cdc-wdm and qmi_wwan drivers in cooperation. The qmi_wwan driver
was first included in 3.4.

Adding only half of the set to cdc-wdm in older stable versions does not
make much sense. I believe this patch should only be applied to 3.4.x
and later. Sorry for not thinking about this earlier and making it
clear in the patch submission.



BjÃrn
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/