1 files changed, 26 insertions, 26 deletions

diff --git a/drivers/tty/isicom.c b/drivers/tty/isicom.c
index 3205b2e9090..db1cf9c328d 100644
--- a/drivers/tty/isicom.c
+++ b/drivers/tty/isicom.c
@@ -102,7 +102,7 @@
  *      You can find the original tools for this direct from Multitech
  *              ftp://ftp.multitech.com/ISI-Cards/
  *
- *      Having installed the cards the module options (/etc/modprobe.d/)
+ *      Having installed the cards the module options (/etc/modprobe.conf)
  *
  *      options isicom   io=card1,card2,card3,card4 irq=card1,card2,card3,card4
  *
@@ -133,6 +133,7 @@
 
 #include <linux/uaccess.h>
 #include <linux/io.h>
+#include <asm/system.h>
 
 #include <linux/pci.h>
 
@@ -148,7 +149,7 @@
 #endif
 
 static int isicom_probe(struct pci_dev *, const struct pci_device_id *);
-static void isicom_remove(struct pci_dev *);
+static void __devexit isicom_remove(struct pci_dev *);
 
 static struct pci_device_id isicom_pci_tbl[] = {
         { PCI_DEVICE(VENDOR_ID, 0x2028) },
@@ -168,7 +169,7 @@ static struct pci_driver isicom_driver = {
         .name           = "isicom",
         .id_table       = isicom_pci_tbl,
         .probe          = isicom_probe,
-        .remove         = isicom_remove
+        .remove         = __devexit_p(isicom_remove)
 };
 
 static int prev_card = 3;       /*      start servicing isi_card[0]     */
@@ -600,10 +601,10 @@ static irqreturn_t isicom_interrupt(int irq, void *dev_id)
                                         port->status &= ~ISI_DCD;
                         }
 
-                        if (tty_port_cts_enabled(&port->port)) {
+                        if (port->port.flags & ASYNC_CTS_FLOW) {
                                 if (tty->hw_stopped) {
                                         if (header & ISI_CTS) {
-                                                tty->hw_stopped = 0;
+                                                port->port.tty->hw_stopped = 0;
                                                 /* start tx ing */
                                                 port->status |= (ISI_TXOK
                                                         | ISI_CTS);
@@ -702,7 +703,7 @@ static void isicom_config_port(struct tty_struct *tty)
 
                 /* 1,2,3,4 => 57.6, 115.2, 230, 460 kbps resp. */
                 if (baud < 1 || baud > 4)
-                        tty->termios.c_cflag &= ~CBAUDEX;
+                        tty->termios->c_cflag &= ~CBAUDEX;
                 else
                         baud += 15;
         }
@@ -848,6 +849,8 @@ static struct tty_port *isicom_find_port(struct tty_struct *tty)
         unsigned int board;
         int line = tty->index;
 
+        if (line < 0 || line > PORT_COUNT-1)
+                return NULL;
         board = BOARD(line);
         card = &isi_card[board];
 
@@ -1196,8 +1199,8 @@ static void isicom_set_termios(struct tty_struct *tty,
         if (isicom_paranoia_check(port, tty->name, "isicom_set_termios"))
                 return;
 
-        if (tty->termios.c_cflag == old_termios->c_cflag &&
-                        tty->termios.c_iflag == old_termios->c_iflag)
+        if (tty->termios->c_cflag == old_termios->c_cflag &&
+                        tty->termios->c_iflag == old_termios->c_iflag)
                 return;
 
         spin_lock_irqsave(&port->card->card_lock, flags);
@@ -1205,7 +1208,7 @@ static void isicom_set_termios(struct tty_struct *tty,
         spin_unlock_irqrestore(&port->card->card_lock, flags);
 
         if ((old_termios->c_cflag & CRTSCTS) &&
-                        !(tty->termios.c_cflag & CRTSCTS)) {
+                        !(tty->termios->c_cflag & CRTSCTS)) {
                 tty->hw_stopped = 0;
                 isicom_start(tty);
         }
@@ -1307,7 +1310,7 @@ static const struct tty_port_operations isicom_port_ops = {
         .shutdown               = isicom_shutdown,
 };
 
-static int reset_card(struct pci_dev *pdev,
+static int __devinit reset_card(struct pci_dev *pdev,
         const unsigned int card, unsigned int *signature)
 {
         struct isi_board *board = pci_get_drvdata(pdev);
@@ -1368,7 +1371,7 @@ end:
         return retval;
 }
 
-static int load_firmware(struct pci_dev *pdev,
+static int __devinit load_firmware(struct pci_dev *pdev,
         const unsigned int index, const unsigned int signature)
 {
         struct isi_board *board = pci_get_drvdata(pdev);
@@ -1548,7 +1551,7 @@ end:
  */
 static unsigned int card_count;
 
-static int isicom_probe(struct pci_dev *pdev,
+static int __devinit isicom_probe(struct pci_dev *pdev,
         const struct pci_device_id *ent)
 {
         unsigned int uninitialized_var(signature), index;
@@ -1595,7 +1598,7 @@ static int isicom_probe(struct pci_dev *pdev,
         }
 
         retval = request_irq(board->irq, isicom_interrupt,
-                        IRQF_SHARED, ISICOM_NAME, board);
+                        IRQF_SHARED | IRQF_DISABLED, ISICOM_NAME, board);
         if (retval < 0) {
                 dev_err(&pdev->dev, "Could not install handler at Irq %d. "
                         "Card%d will be disabled.\n", board->irq, index + 1);
@@ -1610,15 +1613,9 @@ static int isicom_probe(struct pci_dev *pdev,
         if (retval < 0)
                 goto errunri;
 
-        for (index = 0; index < board->port_count; index++) {
-                struct tty_port *tport = &board->ports[index].port;
-                tty_port_init(tport);
-                tport->ops = &isicom_port_ops;
-                tport->close_delay = 50 * HZ/100;
-                tport->closing_wait = 3000 * HZ/100;
-                tty_port_register_device(tport, isicom_normal,
-                                board->index * 16 + index, &pdev->dev);
-        }
+        for (index = 0; index < board->port_count; index++)
+                tty_register_device(isicom_normal, board->index * 16 + index,
+                                &pdev->dev);
 
         return 0;
 
@@ -1635,15 +1632,13 @@ err:
         return retval;
 }
 
-static void isicom_remove(struct pci_dev *pdev)
+static void __devexit isicom_remove(struct pci_dev *pdev)
 {
         struct isi_board *board = pci_get_drvdata(pdev);
         unsigned int i;
 
-        for (i = 0; i < board->port_count; i++) {
+        for (i = 0; i < board->port_count; i++)
                 tty_unregister_device(isicom_normal, board->index * 16 + i);
-                tty_port_destroy(&board->ports[i].port);
-        }
 
         free_irq(board->irq, board);
         pci_release_region(pdev, 3);
@@ -1662,9 +1657,13 @@ static int __init isicom_init(void)
                 isi_card[idx].ports = port;
                 spin_lock_init(&isi_card[idx].card_lock);
                 for (channel = 0; channel < 16; channel++, port++) {
+                        tty_port_init(&port->port);
+                        port->port.ops = &isicom_port_ops;
                         port->magic = ISICOM_MAGIC;
                         port->card = &isi_card[idx];
                         port->channel = channel;
+                        port->port.close_delay = 50 * HZ/100;
+                        port->port.closing_wait = 3000 * HZ/100;
                         port->status = 0;
                         /*  . . .  */
                 }
@@ -1679,6 +1678,7 @@ static int __init isicom_init(void)
                 goto error;
         }
 
+        isicom_normal->owner                    = THIS_MODULE;
         isicom_normal->name                     = "ttyM";
         isicom_normal->major                    = ISICOM_NMAJOR;
         isicom_normal->minor_start              = 0;