5 files changed, 26 insertions, 6 deletions

diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index f2b4ca8692d8..c145e1ed8429 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -469,8 +469,14 @@ static struct usb_device_id id_table_combined [] = {
         { USB_DEVICE(FTDI_VID, XSENS_CONVERTER_7_PID) },
         { USB_DEVICE(MOBILITY_VID, MOBILITY_USB_SERIAL_PID) },
         { USB_DEVICE(FTDI_VID, FTDI_ACTIVE_ROBOTS_PID) },
+        { USB_DEVICE(FTDI_VID, FTDI_MHAM_KW_PID) },
+        { USB_DEVICE(FTDI_VID, FTDI_MHAM_YS_PID) },
         { USB_DEVICE(FTDI_VID, FTDI_MHAM_Y6_PID) },
         { USB_DEVICE(FTDI_VID, FTDI_MHAM_Y8_PID) },
+        { USB_DEVICE(FTDI_VID, FTDI_MHAM_IC_PID) },
+        { USB_DEVICE(FTDI_VID, FTDI_MHAM_DB9_PID) },
+        { USB_DEVICE(FTDI_VID, FTDI_MHAM_RS232_PID) },
+        { USB_DEVICE(FTDI_VID, FTDI_MHAM_Y9_PID) },
         { USB_DEVICE(FTDI_VID, FTDI_TERATRONIK_VCP_PID) },
         { USB_DEVICE(FTDI_VID, FTDI_TERATRONIK_D2XX_PID) },
         { USB_DEVICE(EVOLUTION_VID, EVOLUTION_ER1_PID) },
diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h
index ca40f16370f1..bdef3b8c731f 100644
--- a/drivers/usb/serial/ftdi_sio.h
+++ b/drivers/usb/serial/ftdi_sio.h
@@ -333,10 +333,18 @@
 
 /*
  * microHAM product IDs (http://www.microham.com).
- * Submitted by Justin Burket (KL1RL) <zorton@jtan.com>.
+ * Submitted by Justin Burket (KL1RL) <zorton@jtan.com>
+ * and Mike Studer (K6EEP) <k6eep@hamsoftware.org>.
+ * Ian Abbott <abbotti@mev.co.uk> added a few more from the driver INF file.
  */
+#define FTDI_MHAM_KW_PID 0xEEE8         /* USB-KW interface */
+#define FTDI_MHAM_YS_PID 0xEEE9         /* USB-YS interface */
 #define FTDI_MHAM_Y6_PID 0xEEEA         /* USB-Y6 interface */
 #define FTDI_MHAM_Y8_PID 0xEEEB         /* USB-Y8 interface */
+#define FTDI_MHAM_IC_PID 0xEEEC         /* USB-IC interface */
+#define FTDI_MHAM_DB9_PID 0xEEED        /* USB-DB9 interface */
+#define FTDI_MHAM_RS232_PID 0xEEEE      /* USB-RS232 interface */
+#define FTDI_MHAM_Y9_PID 0xEEEF         /* USB-Y9 interface */
 
 /*
  * Active Robots product ids.
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index 4dd6865d32b0..b5c96e74a903 100644
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -242,8 +242,10 @@ static void serial_close(struct tty_struct *tty, struct file * filp)
 
         down(&port->sem);
 
-        if (port->open_count == 0)
-                goto out;
+        if (port->open_count == 0) {
+                up(&port->sem);
+                return;
+        }
 
         --port->open_count;
         if (port->open_count == 0) {
@@ -260,10 +262,8 @@ static void serial_close(struct tty_struct *tty, struct file * filp)
                 module_put(port->serial->type->driver.owner);
         }
 
-        kref_put(&port->serial->kref, destroy_serial);
-
-out:
         up(&port->sem);
+        kref_put(&port->serial->kref, destroy_serial);
 }
 
 static int serial_write (struct tty_struct * tty, const unsigned char *buf, int count)
diff --git a/drivers/usb/serial/visor.c b/drivers/usb/serial/visor.c
index bce3d55affd8..11a48d874752 100644
--- a/drivers/usb/serial/visor.c
+++ b/drivers/usb/serial/visor.c
@@ -69,6 +69,8 @@ static struct usb_device_id id_table [] = {
                 .driver_info = (kernel_ulong_t)&palm_os_4_probe },
         { USB_DEVICE(HANDSPRING_VENDOR_ID, HANDSPRING_TREO600_ID),
                 .driver_info = (kernel_ulong_t)&palm_os_4_probe },
+        { USB_DEVICE(GSPDA_VENDOR_ID, GSPDA_XPLORE_M68_ID),
+                .driver_info = (kernel_ulong_t)&palm_os_4_probe },
         { USB_DEVICE(PALM_VENDOR_ID, PALM_M500_ID),
                 .driver_info = (kernel_ulong_t)&palm_os_4_probe },
         { USB_DEVICE(PALM_VENDOR_ID, PALM_M505_ID),
@@ -139,6 +141,7 @@ static struct usb_device_id id_table_combined [] = {
         { USB_DEVICE(HANDSPRING_VENDOR_ID, HANDSPRING_VISOR_ID) },
         { USB_DEVICE(HANDSPRING_VENDOR_ID, HANDSPRING_TREO_ID) },
         { USB_DEVICE(HANDSPRING_VENDOR_ID, HANDSPRING_TREO600_ID) },
+        { USB_DEVICE(GSPDA_VENDOR_ID, GSPDA_XPLORE_M68_ID) },
         { USB_DEVICE(PALM_VENDOR_ID, PALM_M500_ID) },
         { USB_DEVICE(PALM_VENDOR_ID, PALM_M505_ID) },
         { USB_DEVICE(PALM_VENDOR_ID, PALM_M515_ID) },
diff --git a/drivers/usb/serial/visor.h b/drivers/usb/serial/visor.h
index b84d1cb4c693..765118d83fb6 100644
--- a/drivers/usb/serial/visor.h
+++ b/drivers/usb/serial/visor.h
@@ -36,6 +36,9 @@
 #define PALM_ZIRE_ID                    0x0070
 #define PALM_M100_ID                    0x0080
 
+#define GSPDA_VENDOR_ID         0x115e
+#define GSPDA_XPLORE_M68_ID             0xf100
+
 #define SONY_VENDOR_ID                  0x054C
 #define SONY_CLIE_3_5_ID                0x0038
 #define SONY_CLIE_4_0_ID                0x0066