From 2829e0b27b7bc9a35cf3a70f0c3c84f9ccb8ac92 Mon Sep 17 00:00:00 2001
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date: Mon, 8 Oct 2012 10:35:46 +0800
Subject: [PATCH] --- yaml --- r: 338359 b: refs/heads/master c:
 59c2e855e43735f4ab93b8b8db96206219f6c1d4 h: refs/heads/master i:   338357:
 e15f440ba6b255a7903bb06599cc4f5b7a923b22   338355:
 136f9bec1a49a120a2bb32d58c4af4e47e36841f   338351:
 f0a7c0fb1ace27a9de84bc7b4a8048ddbe1664d8 v: v3

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

diff --git a/[refs] b/[refs]
index a0e0d8211147..5c815cff0e2d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 54ec52b6dd3b0ba4bc4eb97e7e1b2534705b326c
+refs/heads/master: 59c2e855e43735f4ab93b8b8db96206219f6c1d4
diff --git a/trunk/drivers/tty/serial/vt8500_serial.c b/trunk/drivers/tty/serial/vt8500_serial.c
index 205d4cf4a063..4354fe565f64 100644
--- a/trunk/drivers/tty/serial/vt8500_serial.c
+++ b/trunk/drivers/tty/serial/vt8500_serial.c
@@ -567,10 +567,6 @@ static int __devinit vt8500_serial_probe(struct platform_device *pdev)
 	if (!mmres || !irqres)
 		return -ENODEV;
 
-	vt8500_port = kzalloc(sizeof(struct vt8500_port), GFP_KERNEL);
-	if (!vt8500_port)
-		return -ENOMEM;
-
 	if (np)
 		port = of_alias_get_id(np, "serial");
 		if (port > VT8500_MAX_PORTS)
@@ -593,6 +589,10 @@ static int __devinit vt8500_serial_probe(struct platform_device *pdev)
 		return -EBUSY;
 	}
 
+	vt8500_port = kzalloc(sizeof(struct vt8500_port), GFP_KERNEL);
+	if (!vt8500_port)
+		return -ENOMEM;
+
 	vt8500_port->uart.type = PORT_VT8500;
 	vt8500_port->uart.iotype = UPIO_MEM;
 	vt8500_port->uart.mapbase = mmres->start;