From 0f7b86f1cbba9f7ecd3004107ab40fa96e122032 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Sat, 25 Feb 2012 14:29:48 +0100 Subject: serial imx: fix unregister - Add missing console_unregister call - use dev->priv instead of dev->type_data Signed-off-by: Sascha Hauer --- drivers/serial/serial_imx.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'drivers/serial/serial_imx.c') diff --git a/drivers/serial/serial_imx.c b/drivers/serial/serial_imx.c index 8547f36171..72771fc104 100644 --- a/drivers/serial/serial_imx.c +++ b/drivers/serial/serial_imx.c @@ -322,9 +322,9 @@ static int imx_serial_probe(struct device_d *dev) priv = xzalloc(sizeof(*priv)); cdev = &priv->cdev; + dev->priv = priv; priv->regs = dev_request_mem_region(dev, 0); - dev->type_data = cdev; cdev->dev = dev; cdev->f_caps = CONSOLE_STDIN | CONSOLE_STDOUT | CONSOLE_STDERR; cdev->tstc = imx_serial_tstc; @@ -350,9 +350,11 @@ static int imx_serial_probe(struct device_d *dev) static void imx_serial_remove(struct device_d *dev) { - struct console_device *cdev = dev->type_data; + struct imx_serial_priv *priv = dev->priv; - imx_serial_flush(cdev); + imx_serial_flush(&priv->cdev); + console_unregister(&priv->cdev); + free(priv); } static struct driver_d imx_serial_driver = { -- cgit v1.2.3