From e188b2608ce2f5a27c012b706470bf0fa6504485 Mon Sep 17 00:00:00 2001
From: Bjorn Helgaas <bjorn.helgaas@hp.com>
Date: Wed, 14 Nov 2007 16:59:59 -0800
Subject: [PATCH] --- yaml --- r: 73713 b: refs/heads/master c:
 e02f5f52cafbea013817d81f1acc4baf50d6324b h: refs/heads/master i:   73711:
 0b1b4d8571e26046bef016c1cf31720c3b7fa8c0 v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/serial/8250_pnp.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 128b8b42ce1a..40d68bc9d544 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 57510c2f934a05c53232814761a058399b2ca282
+refs/heads/master: e02f5f52cafbea013817d81f1acc4baf50d6324b
diff --git a/trunk/drivers/serial/8250_pnp.c b/trunk/drivers/serial/8250_pnp.c
index ad0755919bcc..1de098e75497 100644
--- a/trunk/drivers/serial/8250_pnp.c
+++ b/trunk/drivers/serial/8250_pnp.c
@@ -439,7 +439,8 @@ serial_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *dev_id)
 	}
 
 	memset(&port, 0, sizeof(struct uart_port));
-	port.irq = pnp_irq(dev, 0);
+	if (pnp_irq_valid(dev, 0))
+		port.irq = pnp_irq(dev, 0);
 	if (pnp_port_valid(dev, 0)) {
 		port.iobase = pnp_port_start(dev, 0);
 		port.iotype = UPIO_PORT;