From 5c3f9e5a25cbd86beaaf4030327f7f742b663e7a Mon Sep 17 00:00:00 2001
From: Bjorn Helgaas <bjorn.helgaas@hp.com>
Date: Wed, 14 Feb 2007 00:33:05 -0800
Subject: [PATCH] --- yaml --- r: 48319 b: refs/heads/master c:
 9b22271d4b8c1be8a81563c322d3f04e7cbe2153 h: refs/heads/master i:   48317:
 4f44bd8430183ab8ce3da45eefac9bc4572a282a   48315:
 9d529781fb8cc088745b8db19bd7aa562e521dcf   48311:
 fdd6bb206003a294d90a4e8d7db3c1740e0a0a95   48303:
 28115d9fa1dfd8dc3d4f4eff5f88bbca5b081714   48287:
 765eda7c7a3ae26e79556265e30b9b30cca4b8d8   48255:
 1eecad78d5c7bf2cef1bf84090fa6656191315d2 v: v3

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

diff --git a/[refs] b/[refs]
index a33ad6ed07ce..68d3a8249aca 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 40b36daad0ac704e6d5c1b75789f371ef5b053c1
+refs/heads/master: 9b22271d4b8c1be8a81563c322d3f04e7cbe2153
diff --git a/trunk/drivers/serial/8250_pnp.c b/trunk/drivers/serial/8250_pnp.c
index d3d6b82706b5..cde5db44abf6 100644
--- a/trunk/drivers/serial/8250_pnp.c
+++ b/trunk/drivers/serial/8250_pnp.c
@@ -450,11 +450,11 @@ serial_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *dev_id)
 	port.dev = &dev->dev;
 
 	line = serial8250_register_port(&port);
+	if (line < 0)
+		return -ENODEV;
 
-	if (line >= 0)
-		pnp_set_drvdata(dev, (void *)((long)line + 1));
-	return line >= 0 ? 0 : -ENODEV;
-
+	pnp_set_drvdata(dev, (void *)((long)line + 1));
+	return 0;
 }
 
 static void __devexit serial_pnp_remove(struct pnp_dev *dev)