1 files changed, 19 insertions, 13 deletions

diff --git a/drivers/char/mxser.c b/drivers/char/mxser.c
index 5ed2486b7581..c063359baf78 100644
--- a/drivers/char/mxser.c
+++ b/drivers/char/mxser.c
@@ -328,8 +328,8 @@ struct mxser_struct {
         int xmit_tail;
         int xmit_cnt;
         struct work_struct tqueue;
-        struct termios normal_termios;
-        struct termios callout_termios;
+        struct ktermios normal_termios;
+        struct ktermios callout_termios;
         wait_queue_head_t open_wait;
         wait_queue_head_t close_wait;
         wait_queue_head_t delta_msr_wait;
@@ -364,8 +364,8 @@ static int mxserBoardCAP[MXSER_BOARDS] = {
 static struct tty_driver *mxvar_sdriver;
 static struct mxser_struct mxvar_table[MXSER_PORTS];
 static struct tty_struct *mxvar_tty[MXSER_PORTS + 1];
-static struct termios *mxvar_termios[MXSER_PORTS + 1];
-static struct termios *mxvar_termios_locked[MXSER_PORTS + 1];
+static struct ktermios *mxvar_termios[MXSER_PORTS + 1];
+static struct ktermios *mxvar_termios_locked[MXSER_PORTS + 1];
 static struct mxser_log mxvar_log;
 static int mxvar_diagflag;
 static unsigned char mxser_msr[MXSER_PORTS + 1];
@@ -402,7 +402,7 @@ static int mxser_ioctl(struct tty_struct *, struct file *, uint, ulong);
 static int mxser_ioctl_special(unsigned int, void __user *);
 static void mxser_throttle(struct tty_struct *);
 static void mxser_unthrottle(struct tty_struct *);
-static void mxser_set_termios(struct tty_struct *, struct termios *);
+static void mxser_set_termios(struct tty_struct *, struct ktermios *);
 static void mxser_stop(struct tty_struct *);
 static void mxser_start(struct tty_struct *);
 static void mxser_hangup(struct tty_struct *);
@@ -414,7 +414,7 @@ static void mxser_check_modem_status(struct mxser_struct *, int);
 static int mxser_block_til_ready(struct tty_struct *, struct file *, struct mxser_struct *);
 static int mxser_startup(struct mxser_struct *);
 static void mxser_shutdown(struct mxser_struct *);
-static int mxser_change_speed(struct mxser_struct *, struct termios *old_termios);
+static int mxser_change_speed(struct mxser_struct *, struct ktermios *old_termios);
 static int mxser_get_serial_info(struct mxser_struct *, struct serial_struct __user *);
 static int mxser_set_serial_info(struct mxser_struct *, struct serial_struct __user *);
 static int mxser_get_lsr_info(struct mxser_struct *, unsigned int __user *);
@@ -515,6 +515,7 @@ static void __exit mxser_module_exit(void)
                         if (pdev != NULL) {     /* PCI */
                                 release_region(pci_resource_start(pdev, 2), pci_resource_len(pdev, 2));
                                 release_region(pci_resource_start(pdev, 3), pci_resource_len(pdev, 3));
+                                pci_dev_put(pdev);
                         } else {
                                 release_region(mxsercfg[i].ioaddr[0], 8 * mxsercfg[i].ports);
                                 release_region(mxsercfg[i].vector, 1);
@@ -556,7 +557,7 @@ static int mxser_initbrd(int board, struct mxser_hwconf *hwconf)
         n = board * MXSER_PORTS_PER_BOARD;
         info = &mxvar_table[n];
         /*if (verbose) */  {
-                printk(KERN_DEBUG "        ttyM%d - ttyM%d ",
+                printk(KERN_DEBUG "        ttyMI%d - ttyMI%d ",
                         n, n + hwconf->ports - 1);
                 printk(" max. baud rate = %d bps.\n",
                         hwconf->MaxCanSetBaudRate[0]);
@@ -717,7 +718,7 @@ static int mxser_init(void)
         /* Initialize the tty_driver structure */
         memset(mxvar_sdriver, 0, sizeof(struct tty_driver));
         mxvar_sdriver->magic = TTY_DRIVER_MAGIC;
-        mxvar_sdriver->name = "ttyM";
+        mxvar_sdriver->name = "ttyMI";
         mxvar_sdriver->major = ttymajor;
         mxvar_sdriver->minor_start = 0;
         mxvar_sdriver->num = MXSER_PORTS + 1;
@@ -725,6 +726,8 @@ static int mxser_init(void)
         mxvar_sdriver->subtype = SERIAL_TYPE_NORMAL;
         mxvar_sdriver->init_termios = tty_std_termios;
         mxvar_sdriver->init_termios.c_cflag = B9600|CS8|CREAD|HUPCL|CLOCAL;
+        mxvar_sdriver->init_termios.c_ispeed = 9600;
+        mxvar_sdriver->init_termios.c_ospeed = 9600;
         mxvar_sdriver->flags = TTY_DRIVER_REAL_RAW;
         tty_set_operations(mxvar_sdriver, &mxser_ops);
         mxvar_sdriver->ttys = mxvar_tty;
@@ -839,9 +842,9 @@ static int mxser_init(void)
         index = 0;
         b = 0;
         while (b < n) {
-                pdev = pci_find_device(mxser_pcibrds[b].vendor,
+                pdev = pci_get_device(mxser_pcibrds[b].vendor,
                                 mxser_pcibrds[b].device, pdev);
-                        if (pdev == NULL) {
+                if (pdev == NULL) {
                         b++;
                         continue;
                 }
@@ -893,6 +896,9 @@ static int mxser_init(void)
                         if (mxser_initbrd(m, &hwconf) < 0)
                                 continue;
                         m++;
+                        /* Keep an extra reference if we succeeded. It will
+                           be returned at unload time */
+                        pci_dev_get(pdev);
                 }
         }
 #endif
@@ -994,7 +1000,7 @@ static int mxser_open(struct tty_struct *tty, struct file *filp)
                 mxser_change_speed(info, NULL);
         }
 
-        info->session = current->signal->session;
+        info->session = process_session(current);
         info->pgrp = process_group(current);
 
         /*
@@ -1745,7 +1751,7 @@ static void mxser_unthrottle(struct tty_struct *tty)
         /* MX_UNLOCK(&info->slock); */
 }
 
-static void mxser_set_termios(struct tty_struct *tty, struct termios *old_termios)
+static void mxser_set_termios(struct tty_struct *tty, struct ktermios *old_termios)
 {
         struct mxser_struct *info = tty->driver_data;
         unsigned long flags;
@@ -2537,7 +2543,7 @@ static void mxser_shutdown(struct mxser_struct *info)
  * This routine is called to set the UART divisor registers to match
  * the specified baud rate for a serial port.
  */
-static int mxser_change_speed(struct mxser_struct *info, struct termios *old_termios)
+static int mxser_change_speed(struct mxser_struct *info, struct ktermios *old_termios)
 {
         unsigned cflag, cval, fcr;
         int ret = 0;