Patched in Tegra support.

1 files changed, 17 insertions, 18 deletions

diff --git a/drivers/tty/rocket.c b/drivers/tty/rocket.c
index e42009a0052..6a1241c7f84 100644
--- a/drivers/tty/rocket.c
+++ b/drivers/tty/rocket.c
@@ -118,7 +118,7 @@ static unsigned long board2;
 static unsigned long board3;
 static unsigned long board4;
 static unsigned long controller;
-static bool support_low_speed;
+static int support_low_speed;
 static unsigned long modem1;
 static unsigned long modem2;
 static unsigned long modem3;
@@ -673,7 +673,6 @@ static void init_r_port(int board, int aiop, int chan, struct pci_dev *pci_dev)
         if (sInitChan(ctlp, &info->channel, aiop, chan) == 0) {
                 printk(KERN_ERR "RocketPort sInitChan(%d, %d, %d) failed!\n",
                                 board, aiop, chan);
-                tty_port_destroy(&info->port);
                 kfree(info);
                 return;
         }
@@ -705,8 +704,8 @@ static void init_r_port(int board, int aiop, int chan, struct pci_dev *pci_dev)
         spin_lock_init(&info->slock);
         mutex_init(&info->write_mtx);
         rp_table[line] = info;
-        tty_port_register_device(&info->port, rocket_driver, line,
-                        pci_dev ? &pci_dev->dev : NULL);
+        tty_register_device(rocket_driver, line, pci_dev ? &pci_dev->dev :
+                        NULL);
 }
 
 /*
@@ -721,7 +720,7 @@ static void configure_r_port(struct tty_struct *tty, struct r_port *info,
         unsigned rocketMode;
         int bits, baud, divisor;
         CHANNEL_t *cp;
-        struct ktermios *t = &tty->termios;
+        struct ktermios *t = tty->termios;
 
         cp = &info->channel;
         cflag = t->c_cflag;
@@ -893,12 +892,12 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
 {
         struct r_port *info;
         struct tty_port *port;
-        int retval;
+        int line = 0, retval;
         CHANNEL_t *cp;
         unsigned long page;
 
-        info = rp_table[tty->index];
-        if (info == NULL)
+        line = tty->index;
+        if (line < 0 || line >= MAX_RP_PORTS || ((info = rp_table[line]) == NULL))
                 return -ENXIO;
         port = &info->port;
         
@@ -979,7 +978,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
                         tty->alt_speed = 460800;
 
                 configure_r_port(tty, info, NULL);
-                if (tty->termios.c_cflag & CBAUD) {
+                if (tty->termios->c_cflag & CBAUD) {
                         sSetDTR(cp);
                         sSetRTS(cp);
                 }
@@ -1090,35 +1089,35 @@ static void rp_set_termios(struct tty_struct *tty,
         if (rocket_paranoia_check(info, "rp_set_termios"))
                 return;
 
-        cflag = tty->termios.c_cflag;
+        cflag = tty->termios->c_cflag;
 
         /*
          * This driver doesn't support CS5 or CS6
          */
         if (((cflag & CSIZE) == CS5) || ((cflag & CSIZE) == CS6))
-                tty->termios.c_cflag =
+                tty->termios->c_cflag =
                     ((cflag & ~CSIZE) | (old_termios->c_cflag & CSIZE));
         /* Or CMSPAR */
-        tty->termios.c_cflag &= ~CMSPAR;
+        tty->termios->c_cflag &= ~CMSPAR;
 
         configure_r_port(tty, info, old_termios);
 
         cp = &info->channel;
 
         /* Handle transition to B0 status */
-        if ((old_termios->c_cflag & CBAUD) && !(tty->termios.c_cflag & CBAUD)) {
+        if ((old_termios->c_cflag & CBAUD) && !(tty->termios->c_cflag & CBAUD)) {
                 sClrDTR(cp);
                 sClrRTS(cp);
         }
 
         /* Handle transition away from B0 status */
-        if (!(old_termios->c_cflag & CBAUD) && (tty->termios.c_cflag & CBAUD)) {
-                if (!tty->hw_stopped || !(tty->termios.c_cflag & CRTSCTS))
+        if (!(old_termios->c_cflag & CBAUD) && (tty->termios->c_cflag & CBAUD)) {
+                if (!tty->hw_stopped || !(tty->termios->c_cflag & CRTSCTS))
                         sSetRTS(cp);
                 sSetDTR(cp);
         }
 
-        if ((old_termios->c_cflag & CRTSCTS) && !(tty->termios.c_cflag & CRTSCTS)) {
+        if ((old_termios->c_cflag & CRTSCTS) && !(tty->termios->c_cflag & CRTSCTS)) {
                 tty->hw_stopped = 0;
                 rp_start(tty);
         }
@@ -1758,7 +1757,7 @@ static void rp_flush_buffer(struct tty_struct *tty)
 
 #ifdef CONFIG_PCI
 
-static struct pci_device_id __used rocket_pci_ids[] = {
+static struct pci_device_id __devinitdata __used rocket_pci_ids[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_RP, PCI_ANY_ID) },
         { }
 };
@@ -2278,6 +2277,7 @@ static int __init rp_init(void)
          * driver with the tty layer.
          */
 
+        rocket_driver->owner = THIS_MODULE;
         rocket_driver->flags = TTY_DRIVER_DYNAMIC_DEV;
         rocket_driver->name = "ttyR";
         rocket_driver->driver_name = "Comtrol RocketPort";
@@ -2358,7 +2358,6 @@ static void rp_cleanup_module(void)
         for (i = 0; i < MAX_RP_PORTS; i++)
                 if (rp_table[i]) {
                         tty_unregister_device(rocket_driver, i);
-                        tty_port_destroy(&rp_table[i]->port);
                         kfree(rp_table[i]);
                 }