Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 9 insertions, 7 deletions

diff --git a/drivers/serial/jsm/jsm_tty.c b/drivers/serial/jsm/jsm_tty.c
index 7439c0373620..7a4a914ecff0 100644
--- a/drivers/serial/jsm/jsm_tty.c
+++ b/drivers/serial/jsm/jsm_tty.c
@@ -30,6 +30,7 @@
 #include <linux/serial_reg.h>
 #include <linux/delay.h>        /* For udelay */
 #include <linux/pci.h>
+#include <linux/slab.h>
 
 #include "jsm.h"
 
@@ -296,8 +297,6 @@ static void jsm_tty_close(struct uart_port *port)
                 bd->bd_ops->assert_modem_signals(channel);
         }
 
-        channel->ch_old_baud = 0;
-
         /* Turn off UART interrupts for this port */
         channel->ch_bd->bd_ops->uart_off(channel);
 
@@ -432,9 +431,9 @@ int __devinit jsm_tty_init(struct jsm_board *brd)
         return 0;
 }
 
-int __devinit jsm_uart_port_init(struct jsm_board *brd)
+int jsm_uart_port_init(struct jsm_board *brd)
 {
-        int i;
+        int i, rc;
         unsigned int line;
         struct jsm_channel *ch;
 
@@ -469,10 +468,13 @@ int __devinit jsm_uart_port_init(struct jsm_board *brd)
                 } else
                         set_bit(line, linemap);
                 brd->channels[i]->uart_port.line = line;
-                if (uart_add_one_port (&jsm_uart_driver, &brd->channels[i]->uart_port))
-                        printk(KERN_INFO "jsm: add device failed\n");
+                rc = uart_add_one_port (&jsm_uart_driver, &brd->channels[i]->uart_port);
+                if (rc){
+                        printk(KERN_INFO "jsm: Port %d failed. Aborting...\n", i);
+                        return rc;
+                }
                 else
-                        printk(KERN_INFO "Added device \n");
+                        printk(KERN_INFO "jsm: Port %d added\n", i);
         }
 
         jsm_printk(INIT, INFO, &brd->pci_dev, "finish\n");