diff --git a/[refs] b/[refs]
index da812dff84a7..2bf43ab48ca2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 640de636a1f149a92fe54f564ce931ec6b8418c6
+refs/heads/master: 386d95b3ad6f6dad61d0be379873dca66595c1e4
diff --git a/trunk/drivers/tty/moxa.c b/trunk/drivers/tty/moxa.c
index 9dffc724d46f..3b17a044c212 100644
--- a/trunk/drivers/tty/moxa.c
+++ b/trunk/drivers/tty/moxa.c
@@ -977,6 +977,7 @@ static int __devinit moxa_pci_probe(struct pci_dev *pdev,
 	board->basemem = ioremap_nocache(pci_resource_start(pdev, 2), 0x4000);
 	if (board->basemem == NULL) {
 		dev_err(&pdev->dev, "can't remap io space 2\n");
+		retval = -ENOMEM;
 		goto err_reg;
 	}