queue-4.14/qmi_wwan-apply-set_dtr-quirk-to-sierra-wp7607.patch

   1 From abde99af60f616bd20e463e1bafcd4c0eab03d26 Mon Sep 17 00:00:00 2001
   2 From: Beniamino Galvani <bgalvani@redhat.com>
   3 Date: Fri, 15 Feb 2019 13:20:42 +0100
   4 Subject: qmi_wwan: apply SET_DTR quirk to Sierra WP7607
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8
   9 [ Upstream commit 97dc47a1308a3af46a09b1546cfb869f2e382a81 ]
  10
  11 The 1199:68C0 USB ID is reused by Sierra WP7607 which requires the DTR
  12 quirk to be detected. Apply QMI_QUIRK_SET_DTR unconditionally as
  13 already done for other IDs shared between different devices.
  14
  15 Signed-off-by: Beniamino Galvani <bgalvani@redhat.com>
  16 Acked-by: Bjørn Mork <bjorn@mork.no>
  17 Signed-off-by: David S. Miller <davem@davemloft.net>
  18 Signed-off-by: Sasha Levin <sashal@kernel.org>
  19 ---
  20  drivers/net/usb/qmi_wwan.c | 4 ++--
  21  1 file changed, 2 insertions(+), 2 deletions(-)
  22
  23 diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c
  24 index 25204d2c9e89..65e47cc52d14 100644
  25 --- a/drivers/net/usb/qmi_wwan.c
  26 +++ b/drivers/net/usb/qmi_wwan.c
  27 @@ -1193,8 +1193,8 @@ static const struct usb_device_id products[] = {
  28         {QMI_FIXED_INTF(0x114f, 0x68a2, 8)},    /* Sierra Wireless MC7750 */
  29         {QMI_FIXED_INTF(0x1199, 0x68a2, 8)},    /* Sierra Wireless MC7710 in QMI mode */
  30         {QMI_FIXED_INTF(0x1199, 0x68a2, 19)},   /* Sierra Wireless MC7710 in QMI mode */
  31 -       {QMI_FIXED_INTF(0x1199, 0x68c0, 8)},    /* Sierra Wireless MC7304/MC7354 */
  32 -       {QMI_FIXED_INTF(0x1199, 0x68c0, 10)},   /* Sierra Wireless MC7304/MC7354 */
  33 +       {QMI_QUIRK_SET_DTR(0x1199, 0x68c0, 8)}, /* Sierra Wireless MC7304/MC7354, WP76xx */
  34 +       {QMI_QUIRK_SET_DTR(0x1199, 0x68c0, 10)},/* Sierra Wireless MC7304/MC7354 */
  35         {QMI_FIXED_INTF(0x1199, 0x901c, 8)},    /* Sierra Wireless EM7700 */
  36         {QMI_FIXED_INTF(0x1199, 0x901f, 8)},    /* Sierra Wireless EM7355 */
  37         {QMI_FIXED_INTF(0x1199, 0x9041, 8)},    /* Sierra Wireless MC7305/MC7355 */
  38 --
  39 2.19.1
  40