PNP: make generic pnp_add_mem_resource()

[linux-2.6-omap-h63xx.git] / drivers / pnp / isapnp / core.c

diff --git a/drivers/pnp/isapnp/core.c b/drivers/pnp/isapnp/core.c
index bdd8508090da7e5bf82bcd95124d20efa52ab126..f08399497e4cd22669038994d3d0395ebace1bfc 100644 (file)
--- a/drivers/pnp/isapnp/core.c
+++ b/drivers/pnp/isapnp/core.c
@@ -932,7 +932,6 @@ EXPORT_SYMBOL(isapnp_write_byte);
 static int isapnp_read_resources(struct pnp_dev *dev)
 {
        struct pnp_resource *pnp_res;
-       struct resource *res;
        int tmp, ret;
 
        dev->active = isapnp_read_byte(ISAPNP_CFG_ACTIVATE);
@@ -950,12 +949,9 @@ static int isapnp_read_resources(struct pnp_dev *dev)
                            isapnp_read_word(ISAPNP_CFG_MEM + (tmp << 3)) << 8;
                        if (!ret)
                                continue;
-                       pnp_res = pnp_get_pnp_resource(dev, IORESOURCE_MEM,
-                                                      tmp);
-                       pnp_res->index = tmp;
-                       res = &pnp_res->res;
-                       res->start = ret;
-                       res->flags = IORESOURCE_MEM;
+                       pnp_res = pnp_add_mem_resource(dev, ret, ret, 0);
+                       if (pnp_res)
+                               pnp_res->index = tmp;
                }
                for (tmp = 0; tmp < ISAPNP_MAX_IRQ; tmp++) {
                        ret =