diff --git a/[refs] b/[refs] index d477e28d86a9..e4e87656b4ac 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4ac5d7050e4e4d63751e78fb152a274d05c08563 +refs/heads/master: dc6802a771e91050fb686dfeeb9de4c6c9cadb79 diff --git a/trunk/drivers/tty/tty_io.c b/trunk/drivers/tty/tty_io.c index 608749978df4..6784aae210e3 100644 --- a/trunk/drivers/tty/tty_io.c +++ b/trunk/drivers/tty/tty_io.c @@ -181,6 +181,8 @@ struct tty_struct *alloc_tty_struct(void) void free_tty_struct(struct tty_struct *tty) { + if (!tty) + return; if (tty->dev) put_device(tty->dev); kfree(tty->write_buf);