Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...

[linux.git] / drivers / pnp / quirks.c

diff --git a/drivers/pnp/quirks.c b/drivers/pnp/quirks.c
index ffdb12a59c4037a5b44c9bdc3c852443e61131f0..1ff3bb585ab2b0b5f0bb88f8477fe334c26c726a 100644 (file)
--- a/drivers/pnp/quirks.c
+++ b/drivers/pnp/quirks.c
@@ -286,7 +286,7 @@ static void quirk_system_pci_resources(struct pnp_dev *dev)
                                        pci_name(pdev), i,
                                        (unsigned long long) pci_start,
                                        (unsigned long long) pci_end);
-                               res->flags = 0;
+                               res->flags |= IORESOURCE_DISABLED;
                        }
                }
        }
@@ -331,8 +331,7 @@ void pnp_fixup_device(struct pnp_dev *dev)
                        continue;
 #ifdef DEBUG
                dev_dbg(&dev->dev, "%s: calling ", f->id);
-               print_fn_descriptor_symbol("%s\n",
-                               (unsigned long) f->quirk_function);
+               print_fn_descriptor_symbol("%s\n", f->quirk_function);
 #endif
                f->quirk_function(dev);
        }