3 files changed, 15 insertions, 7 deletions

diff --git a/drivers/pnp/interface.c b/drivers/pnp/interface.c
index 3163e3d73da1..9d8b415eca79 100644
--- a/drivers/pnp/interface.c
+++ b/drivers/pnp/interface.c
@@ -265,8 +265,8 @@ static ssize_t pnp_show_current_resources(struct device *dmdev, struct device_at
                                 pnp_printf(buffer," disabled\n");
                         else
                                 pnp_printf(buffer," 0x%llx-0x%llx\n",
-                                                pnp_port_start(dev, i),
-                                                pnp_port_end(dev, i));
+                                        (unsigned long long)pnp_port_start(dev, i),
+                                        (unsigned long long)pnp_port_end(dev, i));
                 }
         }
         for (i = 0; i < PNP_MAX_MEM; i++) {
@@ -276,8 +276,8 @@ static ssize_t pnp_show_current_resources(struct device *dmdev, struct device_at
                                 pnp_printf(buffer," disabled\n");
                         else
                                 pnp_printf(buffer," 0x%llx-0x%llx\n",
-                                                pnp_mem_start(dev, i),
-                                                pnp_mem_end(dev, i));
+                                        (unsigned long long)pnp_mem_start(dev, i),
+                                        (unsigned long long)pnp_mem_end(dev, i));
                 }
         }
         for (i = 0; i < PNP_MAX_IRQ; i++) {
@@ -287,7 +287,7 @@ static ssize_t pnp_show_current_resources(struct device *dmdev, struct device_at
                                 pnp_printf(buffer," disabled\n");
                         else
                                 pnp_printf(buffer," %lld\n",
-                                                pnp_irq(dev, i));
+                                        (unsigned long long)pnp_irq(dev, i));
                 }
         }
         for (i = 0; i < PNP_MAX_DMA; i++) {
@@ -297,7 +297,7 @@ static ssize_t pnp_show_current_resources(struct device *dmdev, struct device_at
                                 pnp_printf(buffer," disabled\n");
                         else
                                 pnp_printf(buffer," %lld\n",
-                                                pnp_dma(dev, i));
+                                        (unsigned long long)pnp_dma(dev, i));
                 }
         }
         ret = (buffer->curr - buf);
diff --git a/drivers/pnp/pnpacpi/rsparser.c b/drivers/pnp/pnpacpi/rsparser.c
index 212268881857..dc79b0a0059f 100644
--- a/drivers/pnp/pnpacpi/rsparser.c
+++ b/drivers/pnp/pnpacpi/rsparser.c
@@ -173,6 +173,9 @@ pnpacpi_parse_allocated_address_space(struct pnp_resource_table *res_table,
                 return;
         }
 
+        if (p->producer_consumer == ACPI_PRODUCER)
+                return;
+
         if (p->resource_type == ACPI_MEMORY_RANGE)
                 pnpacpi_parse_allocated_memresource(res_table,
                                 p->minimum, p->address_length);
@@ -252,9 +255,14 @@ static acpi_status pnpacpi_allocated_resource(struct acpi_resource *res,
                 break;
 
         case ACPI_RESOURCE_TYPE_EXTENDED_ADDRESS64:
+                if (res->data.ext_address64.producer_consumer == ACPI_PRODUCER)
+                        return AE_OK;
                 break;
 
         case ACPI_RESOURCE_TYPE_EXTENDED_IRQ:
+                if (res->data.extended_irq.producer_consumer == ACPI_PRODUCER)
+                        return AE_OK;
+
                 for (i = 0; i < res->data.extended_irq.interrupt_count; i++) {
                         pnpacpi_parse_allocated_irqresource(res_table,
                                 res->data.extended_irq.interrupts[i],
diff --git a/drivers/pnp/pnpbios/core.c b/drivers/pnp/pnpbios/core.c
index b154b3f52cbe..551f58e29810 100644
--- a/drivers/pnp/pnpbios/core.c
+++ b/drivers/pnp/pnpbios/core.c
@@ -346,7 +346,7 @@ static int insert_device(struct pnp_dev *dev, struct pnp_bios_node * node)
         dev->flags = node->flags;
         if (!(dev->flags & PNPBIOS_NO_CONFIG))
                 dev->capabilities |= PNP_CONFIGURABLE;
-        if (!(dev->flags & PNPBIOS_NO_DISABLE))
+        if (!(dev->flags & PNPBIOS_NO_DISABLE) && pnpbios_is_dynamic(dev))
                 dev->capabilities |= PNP_DISABLE;
         dev->capabilities |= PNP_READ;
         if (pnpbios_is_dynamic(dev))