* [PATCH] USB: option: add "D-Link DWM-221 B1" device id
@ 2016-03-28 20:37 Bjørn Mork
2016-04-07 9:34 ` Johan Hovold
0 siblings, 1 reply; 5+ messages in thread
From: Bjørn Mork @ 2016-03-28 20:37 UTC (permalink / raw)
To: Johan Hovold; +Cc: Thomas Schäfer, linux-usb, Bjørn Mork, stable
Thomas reports:
"Windows:
00 diagnostics
01 modem
02 at-port
03 nmea
04 nic
Linux:
T: Bus=02 Lev=01 Prnt=01 Port=03 Cnt=01 Dev#= 4 Spd=480 MxCh= 0
D: Ver= 2.00 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs= 1
P: Vendor=2001 ProdID=7e19 Rev=02.32
S: Manufacturer=Mobile Connect
S: Product=Mobile Connect
S: SerialNumber=0123456789ABCDEF
C: #Ifs= 6 Cfg#= 1 Atr=a0 MxPwr=500mA
I: If#= 0 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=option
I: If#= 1 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
I: If#= 2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
I: If#= 3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
I: If#= 4 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=qmi_wwan
I: If#= 5 Alt= 0 #EPs= 2 Cls=08(stor.) Sub=06 Prot=50 Driver=usb-storage"
Reported-by: Thomas Schäfer <tschaefer@t-online.de>
Cc: <stable@vger.kernel.org>
Signed-off-by: Bjørn Mork <bjorn@mork.no>
---
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 348e19834b83..6ca2cc5790c0 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -1818,6 +1818,8 @@ static const struct usb_device_id option_ids[] = {
{ USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x7d02, 0xff, 0x00, 0x00) },
{ USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x7d03, 0xff, 0x02, 0x01) },
{ USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x7d03, 0xff, 0x00, 0x00) },
+ { USB_DEVICE(0x2001, 0x7e19), /* D-Link DWM-221 B1 */
+ .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
{ USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3e01, 0xff, 0xff, 0xff) }, /* D-Link DWM-152/C1 */
{ USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3e02, 0xff, 0xff, 0xff) }, /* D-Link DWM-156/C1 */
{ USB_DEVICE_INTERFACE_CLASS(0x2020, 0x4000, 0xff) }, /* OLICARD300 - MT6225 */
--
2.1.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] USB: option: add "D-Link DWM-221 B1" device id
2016-03-28 20:37 [PATCH] USB: option: add "D-Link DWM-221 B1" device id Bjørn Mork
@ 2016-04-07 9:34 ` Johan Hovold
2016-04-07 9:54 ` Bjørn Mork
2016-04-07 10:09 ` [PATCH v2] " Bjørn Mork
0 siblings, 2 replies; 5+ messages in thread
From: Johan Hovold @ 2016-04-07 9:34 UTC (permalink / raw)
To: Bjørn Mork; +Cc: Johan Hovold, Thomas Schäfer, linux-usb, stable
On Mon, Mar 28, 2016 at 10:37:35PM +0200, Bj�rn Mork wrote:
> Thomas reports:
> "Windows:
>
> 00 diagnostics
> 01 modem
> 02 at-port
> 03 nmea
> 04 nic
>
> Linux:
>
> T: Bus=02 Lev=01 Prnt=01 Port=03 Cnt=01 Dev#= 4 Spd=480 MxCh= 0
> D: Ver= 2.00 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs= 1
> P: Vendor=2001 ProdID=7e19 Rev=02.32
> S: Manufacturer=Mobile Connect
> S: Product=Mobile Connect
> S: SerialNumber=0123456789ABCDEF
> C: #Ifs= 6 Cfg#= 1 Atr=a0 MxPwr=500mA
> I: If#= 0 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=option
> I: If#= 1 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
> I: If#= 2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
> I: If#= 3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
> I: If#= 4 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=qmi_wwan
> I: If#= 5 Alt= 0 #EPs= 2 Cls=08(stor.) Sub=06 Prot=50 Driver=usb-storage"
>
> Reported-by: Thomas Sch�fer <tschaefer@t-online.de>
> Cc: <stable@vger.kernel.org>
> Signed-off-by: Bj�rn Mork <bjorn@mork.no>
> ---
> 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 348e19834b83..6ca2cc5790c0 100644
> --- a/drivers/usb/serial/option.c
> +++ b/drivers/usb/serial/option.c
> @@ -1818,6 +1818,8 @@ static const struct usb_device_id option_ids[] = {
> { USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x7d02, 0xff, 0x00, 0x00) },
> { USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x7d03, 0xff, 0x02, 0x01) },
> { USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x7d03, 0xff, 0x00, 0x00) },
> + { USB_DEVICE(0x2001, 0x7e19), /* D-Link DWM-221 B1 */
> + .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
Why not use USB_DEVICE_INTERFACE_CLASS here to avoid even trying to
probe the mass-storage interface?
Thanks,
Johan
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] USB: option: add "D-Link DWM-221 B1" device id
2016-04-07 9:34 ` Johan Hovold
@ 2016-04-07 9:54 ` Bjørn Mork
2016-04-07 10:09 ` [PATCH v2] " Bjørn Mork
1 sibling, 0 replies; 5+ messages in thread
From: Bjørn Mork @ 2016-04-07 9:54 UTC (permalink / raw)
To: Johan Hovold; +Cc: Thomas Schäfer, linux-usb, stable
Johan Hovold <johan@kernel.org> writes:
> On Mon, Mar 28, 2016 at 10:37:35PM +0200, Bjørn Mork wrote:
>> Thomas reports:
>> "Windows:
>>
>> 00 diagnostics
>> 01 modem
>> 02 at-port
>> 03 nmea
>> 04 nic
>>
>> Linux:
>>
>> T: Bus=02 Lev=01 Prnt=01 Port=03 Cnt=01 Dev#= 4 Spd=480 MxCh= 0
>> D: Ver= 2.00 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs= 1
>> P: Vendor=2001 ProdID=7e19 Rev=02.32
>> S: Manufacturer=Mobile Connect
>> S: Product=Mobile Connect
>> S: SerialNumber=0123456789ABCDEF
>> C: #Ifs= 6 Cfg#= 1 Atr=a0 MxPwr=500mA
>> I: If#= 0 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=option
>> I: If#= 1 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
>> I: If#= 2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
>> I: If#= 3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
>> I: If#= 4 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=qmi_wwan
>> I: If#= 5 Alt= 0 #EPs= 2 Cls=08(stor.) Sub=06 Prot=50 Driver=usb-storage"
>>
>> Reported-by: Thomas Schäfer <tschaefer@t-online.de>
>> Cc: <stable@vger.kernel.org>
>> Signed-off-by: Bjørn Mork <bjorn@mork.no>
>> ---
>> 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 348e19834b83..6ca2cc5790c0 100644
>> --- a/drivers/usb/serial/option.c
>> +++ b/drivers/usb/serial/option.c
>> @@ -1818,6 +1818,8 @@ static const struct usb_device_id option_ids[] = {
>> { USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x7d02, 0xff, 0x00, 0x00) },
>> { USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x7d03, 0xff, 0x02, 0x01) },
>> { USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x7d03, 0xff, 0x00, 0x00) },
>> + { USB_DEVICE(0x2001, 0x7e19), /* D-Link DWM-221 B1 */
>> + .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
>
> Why not use USB_DEVICE_INTERFACE_CLASS here to avoid even trying to
> probe the mass-storage interface?
Makes sense. Just didn't think about it. Saw the nearby entries and
concluded that it was better with a single USB_DEVICE than multiple
USB_DEVICE_AND_INTERFACE_INFO entries. Forgot all about
USB_DEVICE_INTERFACE_CLASS.
I'll send a v2 ASAP
Bjørn
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2] USB: option: add "D-Link DWM-221 B1" device id
2016-04-07 9:34 ` Johan Hovold
2016-04-07 9:54 ` Bjørn Mork
@ 2016-04-07 10:09 ` Bjørn Mork
2016-04-07 10:20 ` Johan Hovold
1 sibling, 1 reply; 5+ messages in thread
From: Bjørn Mork @ 2016-04-07 10:09 UTC (permalink / raw)
To: Johan Hovold; +Cc: Thomas Schäfer, linux-usb, Bjørn Mork, stable
Thomas reports:
"Windows:
00 diagnostics
01 modem
02 at-port
03 nmea
04 nic
Linux:
T: Bus=02 Lev=01 Prnt=01 Port=03 Cnt=01 Dev#= 4 Spd=480 MxCh= 0
D: Ver= 2.00 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs= 1
P: Vendor=2001 ProdID=7e19 Rev=02.32
S: Manufacturer=Mobile Connect
S: Product=Mobile Connect
S: SerialNumber=0123456789ABCDEF
C: #Ifs= 6 Cfg#= 1 Atr=a0 MxPwr=500mA
I: If#= 0 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=option
I: If#= 1 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
I: If#= 2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
I: If#= 3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
I: If#= 4 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=qmi_wwan
I: If#= 5 Alt= 0 #EPs= 2 Cls=08(stor.) Sub=06 Prot=50 Driver=usb-storage"
Reported-by: Thomas Schäfer <tschaefer@t-online.de>
Cc: <stable@vger.kernel.org>
Signed-off-by: Bjørn Mork <bjorn@mork.no>
---
v2:
- use USB_DEVICE_INTERFACE_CLASS macro for more precise matching as
suggested by Johan
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 348e19834b83..c6f497f16526 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -1818,6 +1818,8 @@ static const struct usb_device_id option_ids[] = {
{ USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x7d02, 0xff, 0x00, 0x00) },
{ USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x7d03, 0xff, 0x02, 0x01) },
{ USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x7d03, 0xff, 0x00, 0x00) },
+ { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7e19, 0xff), /* D-Link DWM-221 B1 */
+ .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
{ USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3e01, 0xff, 0xff, 0xff) }, /* D-Link DWM-152/C1 */
{ USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3e02, 0xff, 0xff, 0xff) }, /* D-Link DWM-156/C1 */
{ USB_DEVICE_INTERFACE_CLASS(0x2020, 0x4000, 0xff) }, /* OLICARD300 - MT6225 */
--
2.1.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v2] USB: option: add "D-Link DWM-221 B1" device id
2016-04-07 10:09 ` [PATCH v2] " Bjørn Mork
@ 2016-04-07 10:20 ` Johan Hovold
0 siblings, 0 replies; 5+ messages in thread
From: Johan Hovold @ 2016-04-07 10:20 UTC (permalink / raw)
To: Bjørn Mork; +Cc: Johan Hovold, Thomas Schäfer, linux-usb, stable
On Thu, Apr 07, 2016 at 12:09:17PM +0200, Bj�rn Mork wrote:
> Thomas reports:
> "Windows:
>
> 00 diagnostics
> 01 modem
> 02 at-port
> 03 nmea
> 04 nic
>
> Linux:
>
> T: Bus=02 Lev=01 Prnt=01 Port=03 Cnt=01 Dev#= 4 Spd=480 MxCh= 0
> D: Ver= 2.00 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs= 1
> P: Vendor=2001 ProdID=7e19 Rev=02.32
> S: Manufacturer=Mobile Connect
> S: Product=Mobile Connect
> S: SerialNumber=0123456789ABCDEF
> C: #Ifs= 6 Cfg#= 1 Atr=a0 MxPwr=500mA
> I: If#= 0 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=option
> I: If#= 1 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
> I: If#= 2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
> I: If#= 3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
> I: If#= 4 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=qmi_wwan
> I: If#= 5 Alt= 0 #EPs= 2 Cls=08(stor.) Sub=06 Prot=50 Driver=usb-storage"
>
> Reported-by: Thomas Sch�fer <tschaefer@t-online.de>
> Cc: <stable@vger.kernel.org>
> Signed-off-by: Bj�rn Mork <bjorn@mork.no>
Applied.
Thanks,
Johan
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-04-07 10:20 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-03-28 20:37 [PATCH] USB: option: add "D-Link DWM-221 B1" device id Bjørn Mork
2016-04-07 9:34 ` Johan Hovold
2016-04-07 9:54 ` Bjørn Mork
2016-04-07 10:09 ` [PATCH v2] " Bjørn Mork
2016-04-07 10:20 ` Johan Hovold
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.