diff --git a/[refs] b/[refs]
index 40d0b622714c..eaba0f690791 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 27dd2e04923341cff96aae164117c44da1072c32
+refs/heads/master: 4053036580f0423be14e79483a939a4aef48c592
diff --git a/trunk/drivers/tty/serial/vt8500_serial.c b/trunk/drivers/tty/serial/vt8500_serial.c
index e50deb771616..ff391db0a220 100644
--- a/trunk/drivers/tty/serial/vt8500_serial.c
+++ b/trunk/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;
 	}