diff --git a/[refs] b/[refs] index d5b40fdee35c..d781d5de085b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f64c84a1668930d1ca2b7dbaa92146c2139cb508 +refs/heads/master: 722d5e4ae89f061582cc46ccbbd3b5ae87a6e165 diff --git a/trunk/drivers/char/mxser_new.c b/trunk/drivers/char/mxser_new.c index 4c805496fb36..1c8e00c4caad 100644 --- a/trunk/drivers/char/mxser_new.c +++ b/trunk/drivers/char/mxser_new.c @@ -927,9 +927,6 @@ static int mxser_open(struct tty_struct *tty, struct file *filp) struct mxser_port *info; int retval, line; - /* initialize driver_data in case something fails */ - tty->driver_data = NULL; - line = tty->index; if (line == MXSER_PORTS) return 0;