lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[SPARC64]: Fix of_iounmap() region release.

Browse Source 
We need to pass in the resource otherwise we cannot
release the region properly.  We must know whether it is
an I/O or MEM resource.

Spotted by Eric Brower.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
2006-12-28 21:01:32 -08:00
parent 6fc5bae797
commit e3a411a3df
16 changed files with 155 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/serial/sunzilog.c
View File

@ -1379,13 +1379,15 @@ static int __devinit zs_probe(struct of_device *op, const struct of_device_id *m
if (!keyboard_mouse) {
err = uart_add_one_port(&sunzilog_reg, &up[0].port);
if (err) {
of_iounmap(rp, sizeof(struct zilog_layout));
of_iounmap(&op->resource[0],
rp, sizeof(struct zilog_layout));
return err;
}
err = uart_add_one_port(&sunzilog_reg, &up[1].port);
if (err) {
uart_remove_one_port(&sunzilog_reg, &up[0].port);
of_iounmap(rp, sizeof(struct zilog_layout));
of_iounmap(&op->resource[0],
rp, sizeof(struct zilog_layout));
return err;
}
} else {
@ -1414,18 +1416,18 @@ static void __devexit zs_remove_one(struct uart_sunzilog_port *up)
uart_remove_one_port(&sunzilog_reg, &up->port);
}
static int __devexit zs_remove(struct of_device *dev)
static int __devexit zs_remove(struct of_device *op)
{
struct uart_sunzilog_port *up = dev_get_drvdata(&dev->dev);
struct uart_sunzilog_port *up = dev_get_drvdata(&op->dev);
struct zilog_layout __iomem *regs;
zs_remove_one(&up[0]);
zs_remove_one(&up[1]);
regs = sunzilog_chip_regs[up[0].port.line / 2];
of_iounmap(regs, sizeof(struct zilog_layout));
of_iounmap(&op->resource[0], regs, sizeof(struct zilog_layout));
dev_set_drvdata(&dev->dev, NULL);
dev_set_drvdata(&op->dev, NULL);
return 0;
}