From 83fcf7ce38a5efc4a4db78c2b477db19525bb464 Mon Sep 17 00:00:00 2001
From: Matt Schulte <matts@commtech-fastcom.com>
Date: Wed, 21 Nov 2012 10:39:18 -0600
Subject: [PATCH] --- yaml --- r: 338462 b: refs/heads/master c:
 13c3237dbcc92fa7d17d3eb06de6477c4bd7fb5d h: refs/heads/master v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/tty/serial/8250/8250_pci.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

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;