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

[mirror_ubuntu-bionic-kernel.git] / drivers / pci / quirks.c

diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index ed2ed867c34c2505ac2d0d77f6347f443dd51cf8..e7292065a1b13f3281eaebde605db8c2eb556145 100644 (file)
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -296,6 +296,7 @@ static void quirk_s3_64M(struct pci_dev *dev)
        struct resource *r = &dev->resource[0];
 
        if ((r->start & 0x3ffffff) || r->end != r->start + 0x3ffffff) {
+               r->flags |= IORESOURCE_UNSET;
                r->start = 0;
                r->end = 0x3ffffff;
        }
@@ -937,6 +938,8 @@ DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_AMD,   PCI_DEVICE_ID_AMD_FE_GATE_700C
 static void quirk_dunord(struct pci_dev *dev)
 {
        struct resource *r = &dev->resource [1];
+
+       r->flags |= IORESOURCE_UNSET;
        r->start = 0;
        r->end = 0xffffff;
 }
@@ -1740,6 +1743,7 @@ static void quirk_tc86c001_ide(struct pci_dev *dev)
        struct resource *r = &dev->resource[0];
 
        if (r->start & 0x8) {
+               r->flags |= IORESOURCE_UNSET;
                r->start = 0;
                r->end = 0xf;
        }
@@ -1769,6 +1773,7 @@ static void quirk_plx_pci9050(struct pci_dev *dev)
                        dev_info(&dev->dev,
                                 "Re-allocating PLX PCI 9050 BAR %u to length 256 to avoid bit 7 bug\n",
                                 bar);
+                       r->flags |= IORESOURCE_UNSET;
                        r->start = 0;
                        r->end = 0xff;
                }