1 files changed, 7 insertions, 17 deletions

diff --git a/drivers/serial/8250_pnp.c b/drivers/serial/8250_pnp.c
index 97c68d021d28..638b68649e79 100644
--- a/drivers/serial/8250_pnp.c
+++ b/drivers/serial/8250_pnp.c
@@ -383,21 +383,14 @@ static int __devinit check_name(char *name)
         return 0;
 }
 
-static int __devinit check_resources(struct pnp_option *option)
+static int __devinit check_resources(struct pnp_dev *dev)
 {
-        struct pnp_option *tmp;
-        if (!option)
-                return 0;
+        resource_size_t base[] = {0x2f8, 0x3f8, 0x2e8, 0x3e8};
+        int i;
 
-        for (tmp = option; tmp; tmp = tmp->next) {
-                struct pnp_port *port;
-                for (port = tmp->port; port; port = port->next)
-                        if ((port->size == 8) &&
-                            ((port->min == 0x2f8) ||
-                             (port->min == 0x3f8) ||
-                             (port->min == 0x2e8) ||
-                             (port->min == 0x3e8)))
-                                return 1;
+        for (i = 0; i < ARRAY_SIZE(base); i++) {
+                if (pnp_possible_config(dev, IORESOURCE_IO, base[i], 8))
+                        return 1;
         }
 
         return 0;
@@ -420,10 +413,7 @@ static int __devinit serial_pnp_guess_board(struct pnp_dev *dev, int *flags)
                 (dev->card && check_name(dev->card->name))))
                         return -ENODEV;
 
-        if (check_resources(dev->independent))
-                return 0;
-
-        if (check_resources(dev->dependent))
+        if (check_resources(dev))
                 return 0;
 
         return -ENODEV;