From d88a2d0b296bd36eb8ba0e1f8f460c9b3429e277 Mon Sep 17 00:00:00 2001
From: Maxime Bizon <mbizon@freebox.fr>
Date: Sat, 30 Jan 2010 18:42:56 +0100
Subject: [PATCH] --- yaml --- r: 185197 b: refs/heads/master c:
 a6d07d14bb5cc83237fb259014c1787ffdb83ccb h: refs/heads/master i:   185195:
 4b6e6ba362f9db53a674b2af1f860e11fe944b63 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/serial/bcm63xx_uart.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 02ba66402dcd..deacef3cf7b9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 599b714ce1ff578f0ff2bc1441122be87c0fa478
+refs/heads/master: a6d07d14bb5cc83237fb259014c1787ffdb83ccb
diff --git a/trunk/drivers/serial/bcm63xx_uart.c b/trunk/drivers/serial/bcm63xx_uart.c
index 37ad0c449937..f78ede824104 100644
--- a/trunk/drivers/serial/bcm63xx_uart.c
+++ b/trunk/drivers/serial/bcm63xx_uart.c
@@ -830,7 +830,7 @@ static int __devinit bcm_uart_probe(struct platform_device *pdev)
 
 	ret = uart_add_one_port(&bcm_uart_driver, port);
 	if (ret) {
-		kfree(port);
+		ports[pdev->id].membase = 0;
 		return ret;
 	}
 	platform_set_drvdata(pdev, port);