1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c
index 48ea47a32d5f..c421d11b3d4c 100644
--- a/drivers/tty/serial/atmel_serial.c
+++ b/drivers/tty/serial/atmel_serial.c
@@ -2447,11 +2447,12 @@ static int atmel_serial_remove(struct platform_device *pdev)
         struct atmel_uart_port *atmel_port = to_atmel_uart_port(port);
         int ret = 0;
 
+        tasklet_kill(&atmel_port->tasklet);
+
         device_init_wakeup(&pdev->dev, 0);
 
         ret = uart_remove_one_port(&atmel_uart, port);
 
-        tasklet_kill(&atmel_port->tasklet);
         kfree(atmel_port->rx_ring.buf);
 
         /* "port" is allocated statically, so we shouldn't free it */