Re: [ 34/95] USB: option: add ZTE K5006-Z

[Ben Hutchings]

On Thu, 2012-09-13 at 17:22 +0200, Thomas SchÃfer wrote:
> http://git.kernel.org/?p=linux/kernel/git/next/linux-next.git;a=commitdiff;h=ba9edaa468869a8cea242a411066b0f490751798

I've added this and the previous change to the queue for 3.2.

Ben.

>  index cc40f47..5ce88d1 100644 (file)
> --- a/drivers/usb/serial/option.c
> +++ b/drivers/usb/serial/option.c
> @@ -886,8 +886,6 @@ static const struct usb_device_id option_ids[] = {
>         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1010, 0xff, 0xff, 0xff),
>           .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
>         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1012, 0xff, 0xff, 0xff) },
> -       { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1018, 0xff, 0xff, 0xff),
> -         .driver_info = (kernel_ulong_t)&net_intf3_blacklist },
>         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1057, 0xff, 0xff, 0xff) },
>         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1058, 0xff, 0xff, 0xff) },
>         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1059, 0xff, 0xff, 0xff) },
> @@ -1092,6 +1090,10 @@ static const struct usb_device_id option_ids[] = {
>          .driver_info = (kernel_ulong_t)&zte_ad3812_z_blacklist },
>         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MC2716, 0xff, 0xff, 0xff),
>          .driver_info = (kernel_ulong_t)&zte_mc2716_z_blacklist },
> +       { USB_VENDOR_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xff, 0x02, 0x01) },
> +       { USB_VENDOR_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xff, 0x02, 0x05) },
> +       { USB_VENDOR_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xff, 0x86, 0x10) },
> +
>         { USB_DEVICE(BENQ_VENDOR_ID, BENQ_PRODUCT_H10) },
>         { USB_DEVICE(DLINK_VENDOR_ID, DLINK_PRODUCT_DWM_652) },
>         { USB_DEVICE(ALINK_VENDOR_ID, DLINK_PRODUCT_DWM_652_U5) }, /* Yes, ALINK_VENDOR_ID */
> 
> 
> I tested the new patch with linux-next-20120913
> 
> It works as expected, at least for the K5006-Z.
> 
> Sorry for the confusion I triggered. I have no clue about the best
> matching methods. My focus is on testing.

-- 
Ben Hutchings
Experience is what causes a person to make new mistakes instead of old ones.

Attachment: signature.asc
Description: This is a digitally signed message part