From: 黄涛 <huangtao@rock-chips.com>
Date: Wed, 18 Jul 2012 02:14:33 +0000 (+0800)
Subject: Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb
X-Git-Tag: firefly_0821_release~8882^2~14
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=728ae3fd2cd7c9d07c08bb3cca1860df85e8dd77;p=firefly-linux-kernel-4.4.55.git

Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb
---

728ae3fd2cd7c9d07c08bb3cca1860df85e8dd77
diff --cc drivers/usb/serial/usb-serial.c
index 6b715c6fb3f1,49d860078b93..eb7f76f3327f
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@@ -1103,13 -1109,13 +1111,19 @@@ int usb_serial_probe(struct usb_interfa
  	else			
  		MT6229_USB = 0;
  #endif
+ #ifdef CONFIG_SEW868		
+ 	if ((le16_to_cpu(dev->descriptor.idVendor) == 0x19d2) && (le16_to_cpu(dev->descriptor.idProduct) == 0xffeb))			
+ 		SEW868_USB =1;		
+ 	else			
+ 		SEW868_USB = 0;
+ #endif
  
 +	/* Avoid race with tty_open and serial_install by setting the
 +	 * disconnected flag and not clearing it until all ports have been
 +	 * registered.
 +	 */
 +	serial->disconnected = 1;
 +
  	if (get_free_serial(serial, num_ports, &minor) == NULL) {
  		dev_err(&interface->dev, "No more free serial devices\n");
  		goto probe_error;