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

From: BjÃrn Mork
Date: Tue Sep 11 2012 - 03:43:44 EST


Thomas SchÃfer <tschaefer@xxxxxxxxxxx> writes:

> Am Montag, 10. September 2012 um 00:42:24 schrieb Ben Hutchings:
>> 3.2-stable review patch. If anyone has any objections, please let me know.
>
>
>
> referring to
>
> http://www.spinics.net/lists/linux-usb/msg70131.html
>
> it should not be done with ff ff ff


Yes, sorry about not getting around to fixing that in time. I've just
submitted a proposed fix. But as my fix removes the bogus entry, you
may just as well go ahead and add this patch to stable so that the fixup
applies cleanly later. If accepted...



BjÃrn

>> ------------------
>>
>> From: BjÃrn Mork <bjorn@xxxxxxx>
>>
>> commit f1b5c997e68533df1f96dcd3068a231bca495603 upstream.
>>
>> The ZTE (Vodafone) K5006-Z use the following
>> interface layout:
>>
>> 00 DIAG
>> 01 secondary
>> 02 modem
>> 03 networkcard
>> 04 storage
>>
>> Ignoring interface #3 which is handled by the qmi_wwan
>> driver.
>>
>> Cc: 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/serial/option.c | 2 ++
>> 1 file changed, 2 insertions(+)
>>
>> diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
>> index 9930628..cc40f47 100644
>> --- a/drivers/usb/serial/option.c
>> +++ b/drivers/usb/serial/option.c
>> @@ -886,6 +886,8 @@ 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) },
--
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/