1 files changed, 22 insertions, 19 deletions

diff --git a/drivers/pnp/manager.c b/drivers/pnp/manager.c
index c706dd2ddb02..1adc83fdabb6 100644
--- a/drivers/pnp/manager.c
+++ b/drivers/pnp/manager.c
@@ -26,7 +26,7 @@ static int pnp_assign_port(struct pnp_dev *dev, struct pnp_port *rule, int idx)
                 dev_dbg(&dev->dev, "  io %d already set to %#llx-%#llx "
                         "flags %#lx\n", idx, (unsigned long long) res->start,
                         (unsigned long long) res->end, res->flags);
-                return 1;
+                return 0;
         }
 
         res = &local_res;
@@ -51,13 +51,13 @@ static int pnp_assign_port(struct pnp_dev *dev, struct pnp_port *rule, int idx)
                                 "(min %#llx max %#llx)\n", idx,
                                 (unsigned long long) rule->min,
                                 (unsigned long long) rule->max);
-                        return 0;
+                        return -EBUSY;
                 }
         }
 
 __add:
         pnp_add_io_resource(dev, res->start, res->end, res->flags);
-        return 1;
+        return 0;
 }
 
 static int pnp_assign_mem(struct pnp_dev *dev, struct pnp_mem *rule, int idx)
@@ -69,7 +69,7 @@ static int pnp_assign_mem(struct pnp_dev *dev, struct pnp_mem *rule, int idx)
                 dev_dbg(&dev->dev, "  mem %d already set to %#llx-%#llx "
                         "flags %#lx\n", idx, (unsigned long long) res->start,
                         (unsigned long long) res->end, res->flags);
-                return 1;
+                return 0;
         }
 
         res = &local_res;
@@ -103,13 +103,13 @@ static int pnp_assign_mem(struct pnp_dev *dev, struct pnp_mem *rule, int idx)
                                 "(min %#llx max %#llx)\n", idx,
                                 (unsigned long long) rule->min,
                                 (unsigned long long) rule->max);
-                        return 0;
+                        return -EBUSY;
                 }
         }
 
 __add:
         pnp_add_mem_resource(dev, res->start, res->end, res->flags);
-        return 1;
+        return 0;
 }
 
 static int pnp_assign_irq(struct pnp_dev *dev, struct pnp_irq *rule, int idx)
@@ -126,7 +126,7 @@ static int pnp_assign_irq(struct pnp_dev *dev, struct pnp_irq *rule, int idx)
         if (res) {
                 dev_dbg(&dev->dev, "  irq %d already set to %d flags %#lx\n",
                         idx, (int) res->start, res->flags);
-                return 1;
+                return 0;
         }
 
         res = &local_res;
@@ -154,14 +154,14 @@ static int pnp_assign_irq(struct pnp_dev *dev, struct pnp_irq *rule, int idx)
                 }
         }
         dev_dbg(&dev->dev, "  couldn't assign irq %d\n", idx);
-        return 0;
+        return -EBUSY;
 
 __add:
         pnp_add_irq_resource(dev, res->start, res->flags);
-        return 1;
+        return 0;
 }
 
-static void pnp_assign_dma(struct pnp_dev *dev, struct pnp_dma *rule, int idx)
+static int pnp_assign_dma(struct pnp_dev *dev, struct pnp_dma *rule, int idx)
 {
         struct resource *res, local_res;
         int i;
@@ -175,7 +175,7 @@ static void pnp_assign_dma(struct pnp_dev *dev, struct pnp_dma *rule, int idx)
         if (res) {
                 dev_dbg(&dev->dev, "  dma %d already set to %d flags %#lx\n",
                         idx, (int) res->start, res->flags);
-                return;
+                return 0;
         }
 
         res = &local_res;
@@ -198,6 +198,7 @@ static void pnp_assign_dma(struct pnp_dev *dev, struct pnp_dma *rule, int idx)
 
 __add:
         pnp_add_dma_resource(dev, res->start, res->flags);
+        return 0;
 }
 
 void pnp_init_resources(struct pnp_dev *dev)
@@ -243,25 +244,26 @@ static int pnp_assign_resources(struct pnp_dev *dev, int depnum)
                 irq = dev->independent->irq;
                 dma = dev->independent->dma;
                 while (port) {
-                        if (!pnp_assign_port(dev, port, nport))
+                        if (pnp_assign_port(dev, port, nport) < 0)
                                 goto fail;
                         nport++;
                         port = port->next;
                 }
                 while (mem) {
-                        if (!pnp_assign_mem(dev, mem, nmem))
+                        if (pnp_assign_mem(dev, mem, nmem) < 0)
                                 goto fail;
                         nmem++;
                         mem = mem->next;
                 }
                 while (irq) {
-                        if (!pnp_assign_irq(dev, irq, nirq))
+                        if (pnp_assign_irq(dev, irq, nirq) < 0)
                                 goto fail;
                         nirq++;
                         irq = irq->next;
                 }
                 while (dma) {
-                        pnp_assign_dma(dev, dma, ndma);
+                        if (pnp_assign_dma(dev, dma, ndma) < 0)
+                                goto fail;
                         ndma++;
                         dma = dma->next;
                 }
@@ -281,25 +283,26 @@ static int pnp_assign_resources(struct pnp_dev *dev, int depnum)
                 irq = dep->irq;
                 dma = dep->dma;
                 while (port) {
-                        if (!pnp_assign_port(dev, port, nport))
+                        if (pnp_assign_port(dev, port, nport) < 0)
                                 goto fail;
                         nport++;
                         port = port->next;
                 }
                 while (mem) {
-                        if (!pnp_assign_mem(dev, mem, nmem))
+                        if (pnp_assign_mem(dev, mem, nmem) < 0)
                                 goto fail;
                         nmem++;
                         mem = mem->next;
                 }
                 while (irq) {
-                        if (!pnp_assign_irq(dev, irq, nirq))
+                        if (pnp_assign_irq(dev, irq, nirq) < 0)
                                 goto fail;
                         nirq++;
                         irq = irq->next;
                 }
                 while (dma) {
-                        pnp_assign_dma(dev, dma, ndma);
+                        if (pnp_assign_dma(dev, dma, ndma) < 0)
+                                goto fail;
                         ndma++;
                         dma = dma->next;
                 }