net: qmi_wwan: ignore bogus CDC Union descriptors

The CDC descriptors found on these vendor specific functions should
not be considered authoritative.  They seem to be ignored by drivers
for other systems, and the quality is therefore low.

One device (1e0e:9001) has been reported to have such a bogus union
descriptor on the QMI function, making it fail probing even if the
device id was dynamically added.  The report was not complete enough
to allow adding a device entry for this modem. But this should at
least fix the dynamic id probing problem.

Reported-by: Kanerva Topi <Topi.Kanerva@cinia.fi>
Signed-off-by: Bjørn Mork <bjorn@mork.no>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c
index babc84a3946c216bd184901717a0dd84758c9cc9..d0b29733c021fae35a10ed7c84aba2e4c1fb79bc 100644 (file)
--- a/drivers/net/usb/qmi_wwan.c
+++ b/drivers/net/usb/qmi_wwan.c
@@ -374,7 +374,10 @@ static int qmi_wwan_bind(struct usbnet *dev, struct usb_interface *intf)
                                "bogus CDC Union: master=%u, slave=%u\n",
                                cdc_union->bMasterInterface0,
                                cdc_union->bSlaveInterface0);
-                       goto err;
+
+                       /* ignore and continue... */
+                       cdc_union = NULL;
+                       info->data = intf;
                }
        }