summaryrefslogtreecommitdiffstats
path: root/drivers/char/mxser.c
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2010-04-23 16:01:18 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2010-04-30 09:20:33 -0700
commita2d1e3516c80027b2da17fb0b7ccd36f0ac33aa7 (patch)
tree74933d064c4933f3b84a0e6943caf50f5fe9ba9e /drivers/char/mxser.c
parent66f41d4c5c8a5deed66fdcc84509376c9a0bf9d8 (diff)
downloadop-kernel-dev-a2d1e3516c80027b2da17fb0b7ccd36f0ac33aa7.zip
op-kernel-dev-a2d1e3516c80027b2da17fb0b7ccd36f0ac33aa7.tar.gz
tty: Fix regressions in the char driver conversion
This forgot to update a field in the old char drivers. The fact nobody has basically noticed (except one mxser user) rather suggests most of these drivers could go into the bitbucket. Signed-off-by: Alan Cox <alan@linux.intel.com> Cc: Jiri Slaby <jirislaby@gmail.com> Cc: Dan Carpenter <error27@gmail.com> Cc: Andreas Pretzsch <apr@cn-eng.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/char/mxser.c')
-rw-r--r--drivers/char/mxser.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/char/mxser.c b/drivers/char/mxser.c
index 4702305..d2692d4 100644
--- a/drivers/char/mxser.c
+++ b/drivers/char/mxser.c
@@ -1011,6 +1011,7 @@ static int mxser_open(struct tty_struct *tty, struct file *filp)
if (!info->ioaddr)
return -ENODEV;
+ tty->driver_data = info;
return tty_port_open(&info->port, tty, filp);
}
@@ -1074,7 +1075,7 @@ static void mxser_close(struct tty_struct *tty, struct file *filp)
struct mxser_port *info = tty->driver_data;
struct tty_port *port = &info->port;
- if (tty->index == MXSER_PORTS)
+ if (tty->index == MXSER_PORTS || info == NULL)
return;
if (tty_port_close_start(port, tty, filp) == 0)
return;
OpenPOWER on IntegriCloud