From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754869Ab3ANCEL (ORCPT ); Sun, 13 Jan 2013 21:04:11 -0500 Received: from server.prisktech.co.nz ([115.188.14.127]:59779 "EHLO server.prisktech.co.nz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751897Ab3ANCEJ (ORCPT ); Sun, 13 Jan 2013 21:04:09 -0500 From: Tony Prisk To: Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, vt8500-wm8505-linux-kernel@googlegroups.com, Tony Prisk Subject: [PATCH 2/4] serial: vt8500: ioremap'd resource is never freed Date: Mon, 14 Jan 2013 15:04:17 +1300 Message-Id: <1358129060-9399-3-git-send-email-linux@prisktech.co.nz> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1358129060-9399-1-git-send-email-linux@prisktech.co.nz> References: <1358129060-9399-1-git-send-email-linux@prisktech.co.nz> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 -EBUSY rather than -ENOMEM. Signed-off-by: Tony Prisk --- drivers/tty/serial/vt8500_serial.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/tty/serial/vt8500_serial.c b/drivers/tty/serial/vt8500_serial.c index 4c4a58d..8865afd 100644 --- a/drivers/tty/serial/vt8500_serial.c +++ b/drivers/tty/serial/vt8500_serial.c @@ -615,9 +615,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 = -EBUSY; goto err; } -- 1.7.9.5