summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorAleksander Morgado <aleksander@aleksander.es>2014-02-12 16:04:45 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-03-11 16:10:01 -0700
commitf922754e32d72b890ad471b5efd76b38c25f7d17 (patch)
tree0be61faebac677af82221187e46465d424417449 /drivers
parent1d0230273dea6597819c4fe9f64f5bb891241578 (diff)
downloadlwn-f922754e32d72b890ad471b5efd76b38c25f7d17.tar.gz
lwn-f922754e32d72b890ad471b5efd76b38c25f7d17.zip
USB: serial: option: blacklist interface 4 for Cinterion PHS8 and PXS8
commit 12df84d4a80278a5b1abfec3206795291da52fc9 upstream. This interface is to be handled by the qmi_wwan driver. CC: Hans-Christoph Schemmel <hans-christoph.schemmel@gemalto.com> CC: Christian Schmiedl <christian.schmiedl@gemalto.com> CC: Nicolaus Colberg <nicolaus.colberg@gemalto.com> CC: David McCullough <david.mccullough@accelecon.com> Signed-off-by: Aleksander Morgado <aleksander@aleksander.es> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/serial/option.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index abfb45b3940a..8b5c8e5d78d8 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -1546,7 +1546,8 @@ static const struct usb_device_id option_ids[] = {
/* Cinterion */
{ USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_EU3_E) },
{ USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_EU3_P) },
- { USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_PH8) },
+ { USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_PH8),
+ .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
{ USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_AHXX) },
{ USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_PLXX),
.driver_info = (kernel_ulong_t)&net_intf4_blacklist },