summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2012-02-25 14:28:35 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2012-02-25 15:16:14 +0100
commitb059ed81848be5e55e401b876a6de1038486431a (patch)
tree25f054d120027894195f6f81106986748bc88105 /drivers
parent837a0c2e04d50c21f33102d589f20d0ce555cb8a (diff)
downloadbarebox-b059ed81848be5e55e401b876a6de1038486431a.tar.gz
barebox-b059ed81848be5e55e401b876a6de1038486431a.tar.xz
serial pxa: fix unregister
- Add missing console_unregister call - use dev->priv instead of dev->type_data Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/serial/serial_pxa.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/serial/serial_pxa.c b/drivers/serial/serial_pxa.c
index d295235ee3..1365413e56 100644
--- a/drivers/serial/serial_pxa.c
+++ b/drivers/serial/serial_pxa.c
@@ -168,7 +168,7 @@ static int pxa_serial_probe(struct device_d *dev)
cdev = &priv->cdev;
priv->regs = dev_request_mem_region(dev, 0);
- dev->type_data = cdev;
+ dev->priv = priv
cdev->dev = dev;
cdev->f_caps = CONSOLE_STDIN | CONSOLE_STDOUT | CONSOLE_STDERR;
cdev->tstc = pxa_serial_tstc;
@@ -184,7 +184,10 @@ static int pxa_serial_probe(struct device_d *dev)
static void pxa_serial_remove(struct device_d *dev)
{
- free(dev->type_data);
+ struct pxa_serial_priv *priv = dev->priv;
+
+ console_unregister(&priv->cdev);
+ free(priv);
}
static struct driver_d pxa_serial_driver = {