summaryrefslogtreecommitdiffstats
path: root/drivers/tty
diff options
context:
space:
mode:
authorTony Prisk <linux@prisktech.co.nz>2013-01-16 20:05:41 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-18 02:24:15 +0100
commit4053036580f0423be14e79483a939a4aef48c592 (patch)
tree198884cf0bdbd24e8137ca2dc0191d828a1d1acf /drivers/tty
parentserial: vt8500: Fix range-checking on vt8500_uart_ports (diff)
downloadlinux-4053036580f0423be14e79483a939a4aef48c592.tar.xz
linux-4053036580f0423be14e79483a939a4aef48c592.zip
serial: vt8500: ioremap'd resource is never freed
Memory mapped via ioremap call is never released. Rather than add an iounmap call, change allocation function to devm_request_and_ioremap. Also, change the error on failure for this call to -EADDRNOTAVAIL rather than -ENOMEM. Signed-off-by: Tony Prisk <linux@prisktech.co.nz> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/serial/vt8500_serial.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/tty/serial/vt8500_serial.c b/drivers/tty/serial/vt8500_serial.c
index e50deb771616..ff391db0a220 100644
--- a/drivers/tty/serial/vt8500_serial.c
+++ b/drivers/tty/serial/vt8500_serial.c
@@ -606,9 +606,9 @@ static int vt8500_serial_probe(struct platform_device *pdev)
snprintf(vt8500_port->name, sizeof(vt8500_port->name),
"VT8500 UART%d", pdev->id);
- vt8500_port->uart.membase = ioremap(mmres->start, resource_size(mmres));
+ vt8500_port->uart.membase = devm_request_and_ioremap(&pdev->dev, mmres);
if (!vt8500_port->uart.membase) {
- ret = -ENOMEM;
+ ret = -EADDRNOTAVAIL;
goto err;
}