diff --git a/[refs] b/[refs]
index bc5444d5f711..516255130673 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 14faa8cce88e18ed4daf5c3643f0faa4198863f9
+refs/heads/master: 13c3237dbcc92fa7d17d3eb06de6477c4bd7fb5d
diff --git a/trunk/drivers/tty/serial/8250/8250_pci.c b/trunk/drivers/tty/serial/8250/8250_pci.c
index a795bd971eaa..26b9dc012ed0 100644
--- a/trunk/drivers/tty/serial/8250/8250_pci.c
+++ b/trunk/drivers/tty/serial/8250/8250_pci.c
@@ -1172,6 +1172,8 @@ pci_xr17v35x_setup(struct serial_private *priv,
 	u8 __iomem *p;
 
 	p = pci_ioremap_bar(priv->dev, 0);
+	if (p == NULL)
+		return -ENOMEM;
 
 	port->port.flags |= UPF_EXAR_EFR;