1 files changed, 21 insertions, 4 deletions

diff --git a/drivers/pnp/manager.c b/drivers/pnp/manager.c
index ed9ce507149a..95cebf0185de 100644
--- a/drivers/pnp/manager.c
+++ b/drivers/pnp/manager.c
@@ -18,11 +18,27 @@
 
 DEFINE_MUTEX(pnp_res_mutex);
 
+static struct resource *pnp_find_resource(struct pnp_dev *dev,
+                                          unsigned char rule,
+                                          unsigned long type,
+                                          unsigned int bar)
+{
+        struct resource *res = pnp_get_resource(dev, type, bar);
+
+        /* when the resource already exists, set its resource bits from rule */
+        if (res) {
+                res->flags &= ~IORESOURCE_BITS;
+                res->flags |= rule & IORESOURCE_BITS;
+        }
+
+        return res;
+}
+
 static int pnp_assign_port(struct pnp_dev *dev, struct pnp_port *rule, int idx)
 {
         struct resource *res, local_res;
 
-        res = pnp_get_resource(dev, IORESOURCE_IO, idx);
+        res = pnp_find_resource(dev, rule->flags, IORESOURCE_IO, idx);
         if (res) {
                 pnp_dbg(&dev->dev, "  io %d already set to %#llx-%#llx "
                         "flags %#lx\n", idx, (unsigned long long) res->start,
@@ -65,7 +81,7 @@ static int pnp_assign_mem(struct pnp_dev *dev, struct pnp_mem *rule, int idx)
 {
         struct resource *res, local_res;
 
-        res = pnp_get_resource(dev, IORESOURCE_MEM, idx);
+        res = pnp_find_resource(dev, rule->flags, IORESOURCE_MEM, idx);
         if (res) {
                 pnp_dbg(&dev->dev, "  mem %d already set to %#llx-%#llx "
                         "flags %#lx\n", idx, (unsigned long long) res->start,
@@ -78,6 +94,7 @@ static int pnp_assign_mem(struct pnp_dev *dev, struct pnp_mem *rule, int idx)
         res->start = 0;
         res->end = 0;
 
+        /* ??? rule->flags restricted to 8 bits, all tests bogus ??? */
         if (!(rule->flags & IORESOURCE_MEM_WRITEABLE))
                 res->flags |= IORESOURCE_READONLY;
         if (rule->flags & IORESOURCE_MEM_CACHEABLE)
@@ -123,7 +140,7 @@ static int pnp_assign_irq(struct pnp_dev *dev, struct pnp_irq *rule, int idx)
                 5, 10, 11, 12, 9, 14, 15, 7, 3, 4, 13, 0, 1, 6, 8, 2
         };
 
-        res = pnp_get_resource(dev, IORESOURCE_IRQ, idx);
+        res = pnp_find_resource(dev, rule->flags, IORESOURCE_IRQ, idx);
         if (res) {
                 pnp_dbg(&dev->dev, "  irq %d already set to %d flags %#lx\n",
                         idx, (int) res->start, res->flags);
@@ -182,7 +199,7 @@ static int pnp_assign_dma(struct pnp_dev *dev, struct pnp_dma *rule, int idx)
                 1, 3, 5, 6, 7, 0, 2, 4
         };
 
-        res = pnp_get_resource(dev, IORESOURCE_DMA, idx);
+        res = pnp_find_resource(dev, rule->flags, IORESOURCE_DMA, idx);
         if (res) {
                 pnp_dbg(&dev->dev, "  dma %d already set to %d flags %#lx\n",
                         idx, (int) res->start, res->flags);