diff --git a/[refs] b/[refs] index cc6f5a5607b0..acc24c20d6a1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f751928e0ddf54ea4fe5546f35e99efc5b5d9938 +refs/heads/master: bc3256288b8ff9787623805e53cf7c6d5a2b4591 diff --git a/trunk/drivers/serial/serial_core.c b/trunk/drivers/serial/serial_core.c index daeba1c52c8e..9425ed69e0f7 100644 --- a/trunk/drivers/serial/serial_core.c +++ b/trunk/drivers/serial/serial_core.c @@ -2530,10 +2530,8 @@ int uart_remove_one_port(struct uart_driver *drv, struct uart_port *port) /* * Kill the tasklet, and free resources. */ - if (info) { + if (info) tasklet_kill(&info->tlet); - kfree(info); - } state->port = NULL; mutex_unlock(&port_mutex);