Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52d0dc75 authored by Dmitry Kunilov's avatar Dmitry Kunilov Committed by Greg Kroah-Hartman
Browse files

usb: serial: zte_ev: move support for ZTE AC2726 from zte_ev back to option 



ZTE AC2726 EVDO modem drops ppp connection every minute when driven by
zte_ev but works fine when driven by option. Move the support for AC2726
back to option driver.

Signed-off-by: default avatarDmitry Kunilov <dmitry.kunilov@gmail.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4144bc86

drivers/usb/serial/option.c

+2 −0
Original line number Diff line number Diff line
@@ -251,6 +251,7 @@ static void option_instat_callback(struct urb *urb); 
#define ZTE_PRODUCT_MF628			0x0015

#define ZTE_PRODUCT_MF626			0x0031

#define ZTE_PRODUCT_MC2718			0xffe8

#define ZTE_PRODUCT_AC2726			0xfff1



#define BENQ_VENDOR_ID				0x04a5

#define BENQ_PRODUCT_H10			0x4068
@@ -1453,6 +1454,7 @@ static const struct usb_device_id option_ids[] = { 
	{ USB_VENDOR_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xff, 0x02, 0x01) },

	{ USB_VENDOR_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xff, 0x02, 0x05) },

	{ USB_VENDOR_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xff, 0x86, 0x10) },

	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_AC2726, 0xff, 0xff, 0xff) },



	{ USB_DEVICE(BENQ_VENDOR_ID, BENQ_PRODUCT_H10) },

	{ USB_DEVICE(DLINK_VENDOR_ID, DLINK_PRODUCT_DWM_652) },

drivers/usb/serial/zte_ev.c

+1 −2
Original line number Diff line number Diff line
@@ -281,8 +281,7 @@ static const struct usb_device_id id_table[] = { 
	{ USB_DEVICE(0x19d2, 0xfffd) },

	{ USB_DEVICE(0x19d2, 0xfffc) },

	{ USB_DEVICE(0x19d2, 0xfffb) },

	/* AC2726, AC8710_V3 */

	{ USB_DEVICE_AND_INTERFACE_INFO(0x19d2, 0xfff1, 0xff, 0xff, 0xff) },

	/* AC8710_V3 */

	{ USB_DEVICE(0x19d2, 0xfff6) },

	{ USB_DEVICE(0x19d2, 0xfff7) },

	{ USB_DEVICE(0x19d2, 0xfff8) },