diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-16 15:28:30 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-16 15:28:30 -0700 |
| commit | 135b8ee782cd71ee2e858d0f75e53e0a375b3e3b (patch) | |
| tree | b971c4a77942506ac940b1dabd54cbec4cf269e4 | |
| parent | 1f7a72fefc462af1ed22a77cabe6f0cafedb2a8c (diff) | |
| download | patches-135b8ee782cd71ee2e858d0f75e53e0a375b3e3b.tar.gz | |
bug fix a few patches
| -rw-r--r-- | usb.current/usb-option.c-add-pirelli-vid-pid-and-indicate-pirelli-s-modem-interface-is-0xff.patch | 23 | ||||
| -rw-r--r-- | usb/usb-serial-use-tty_port-version-console-instead-of-usb_serial_port.patch | 13 |
2 files changed, 26 insertions, 10 deletions
diff --git a/usb.current/usb-option.c-add-pirelli-vid-pid-and-indicate-pirelli-s-modem-interface-is-0xff.patch b/usb.current/usb-option.c-add-pirelli-vid-pid-and-indicate-pirelli-s-modem-interface-is-0xff.patch index 569b0dc4d5c257..38dcea0aee6b2d 100644 --- a/usb.current/usb-option.c-add-pirelli-vid-pid-and-indicate-pirelli-s-modem-interface-is-0xff.patch +++ b/usb.current/usb-option.c-add-pirelli-vid-pid-and-indicate-pirelli-s-modem-interface-is-0xff.patch @@ -9,8 +9,8 @@ Signed-off-by: spark <spark@bandrich.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- - drivers/usb/serial/option.c | 42 ++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 42 insertions(+) + drivers/usb/serial/option.c | 43 +++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 43 insertions(+) --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c @@ -64,9 +64,16 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> { } /* Terminating entry */ }; MODULE_DEVICE_TABLE(usb, option_ids); -@@ -781,6 +817,12 @@ static int __init option_init(void) - printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":" - DRIVER_DESC "\n"); +@@ -802,12 +838,19 @@ static int option_probe(struct usb_seria + const struct usb_device_id *id) + { + struct option_intf_private *data; ++ + /* D-Link DWM 652 still exposes CD-Rom emulation interface in modem mode */ + if (serial->dev->descriptor.idVendor == DLINK_VENDOR_ID && + serial->dev->descriptor.idProduct == DLINK_PRODUCT_DWM_652 && + serial->interface->cur_altsetting->desc.bInterfaceClass == 0x8) + return -ENODEV; + /* Bandrich modem and AT command interface is 0xff */ + if ((serial->dev->descriptor.idVendor == BANDRICH_VENDOR_ID || @@ -74,6 +81,6 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + serial->interface->cur_altsetting->desc.bInterfaceClass != 0xff) + return -ENODEV; + - return 0; - - failed_driver_register: + data = serial->private = kzalloc(sizeof(struct option_intf_private), GFP_KERNEL); + if (!data) + return -ENOMEM; diff --git a/usb/usb-serial-use-tty_port-version-console-instead-of-usb_serial_port.patch b/usb/usb-serial-use-tty_port-version-console-instead-of-usb_serial_port.patch index 2e1416092dda81..f2b2209afc59f3 100644 --- a/usb/usb-serial-use-tty_port-version-console-instead-of-usb_serial_port.patch +++ b/usb/usb-serial-use-tty_port-version-console-instead-of-usb_serial_port.patch @@ -24,9 +24,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> drivers/usb/serial/ftdi_sio.c | 2 +- drivers/usb/serial/generic.c | 4 ++-- drivers/usb/serial/pl2303.c | 2 +- - drivers/usb/serial/usb-serial.c | 2 +- + drivers/usb/serial/usb-serial.c | 4 ++-- include/linux/usb/serial.h | 2 -- - 6 files changed, 7 insertions(+), 10 deletions(-) + 6 files changed, 8 insertions(+), 11 deletions(-) --- a/drivers/usb/serial/console.c +++ b/drivers/usb/serial/console.c @@ -100,6 +100,15 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> int i; --- a/drivers/usb/serial/usb-serial.c +++ b/drivers/usb/serial/usb-serial.c +@@ -289,7 +289,7 @@ static void serial_down(struct tty_port + * The console is magical. Do not hang up the console hardware + * or there will be tears. + */ +- if (port->console) ++ if (port->port.console) + return; + if (drv->close) + drv->close(port); @@ -328,7 +328,7 @@ static void serial_cleanup(struct tty_st /* The console is magical. Do not hang up the console hardware * or there will be tears. |