From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 054F6C43381 for ; Mon, 1 Apr 2019 17:26:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BF80820856 for ; Mon, 1 Apr 2019 17:26:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554139565; bh=xBz3dkujLF083TltlPJLUzRGS2vCXjnQB28aLy/mAlE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=jFeKIYlcUe7ohGh9PhtPMPp4nbxwUg1Wqn9LrskDiuAltbPdRhh/8maMZGc9YKnFT la8D4cV4WltpCJJJbo14GfREwEZ5Hx9bZKDaxVZwj+z0WDePf+U+efstwocPZIP+oe Lwey6KtSNdMJtdVTa38B63EVaPUxYeaaMWMbptos= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732280AbfDARZ7 (ORCPT ); Mon, 1 Apr 2019 13:25:59 -0400 Received: from mail.kernel.org ([198.145.29.99]:57690 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732480AbfDARZ5 (ORCPT ); Mon, 1 Apr 2019 13:25:57 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8CA4A20856; Mon, 1 Apr 2019 17:25:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554139557; bh=xBz3dkujLF083TltlPJLUzRGS2vCXjnQB28aLy/mAlE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hVI/ewfFvvYEItHMsgVBbDZbqqnH81T/HBRsTjWZmGt7bCi+Hi5c5+VZLu7j4wN06 0s8VLzmh2Uzwz0F4LvIeXHgf87zAHsYxW6D92z5Er2LPEELL8Vq+ddPDrER4TKQNfv 7qSx2zOiIMoSgTH0bT4OocGLsDxN8zApVmgZorGc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mans Rullgard , Johan Hovold Subject: [PATCH 4.14 085/107] USB: serial: option: set driver_info for SIM5218 and compatibles Date: Mon, 1 Apr 2019 19:02:40 +0200 Message-Id: <20190401170053.362719466@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190401170045.246405031@linuxfoundation.org> References: <20190401170045.246405031@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Mans Rullgard commit f8df5c2c3e2df5ffaf9fb5503da93d477a8c7db4 upstream. The SIMCom SIM5218 and compatible devices have 5 USB interfaces, only 4 of which are serial ports. The fifth is a network interface supported by the qmi-wwan driver. Furthermore, the serial ports do not support modem control signals. Add driver_info flags to reflect this. Signed-off-by: Mans Rullgard Fixes: ec0cd94d881c ("usb: option: add SIMCom SIM5218") Cc: stable # 3.2 Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman --- drivers/usb/serial/option.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c @@ -1069,7 +1069,8 @@ static const struct usb_device_id option .driver_info = RSVD(3) }, { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x6613)}, /* Onda H600/ZTE MF330 */ { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x0023)}, /* ONYX 3G device */ - { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x9000)}, /* SIMCom SIM5218 */ + { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x9000), /* SIMCom SIM5218 */ + .driver_info = NCTRL(0) | NCTRL(1) | NCTRL(2) | NCTRL(3) | RSVD(4) }, /* Quectel products using Qualcomm vendor ID */ { USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC15)}, { USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC20),