From 87b05c4e0ae6bda43584cb0248406c30d085bb6c Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Fri, 26 Aug 2005 10:49:22 -0700 Subject: [PATCH] --- yaml --- r: 5998 b: refs/heads/master c: 755528c860b05fcecda1c88a2bdaffcb50760a7f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/pci/setup-res.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index deb67a3e6764..981ba223ddfd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 26aad69e3dd854abe9028ca873fb40b410a39dd7 +refs/heads/master: 755528c860b05fcecda1c88a2bdaffcb50760a7f diff --git a/trunk/drivers/pci/setup-res.c b/trunk/drivers/pci/setup-res.c index 84eedc965688..5598b4714f77 100644 --- a/trunk/drivers/pci/setup-res.c +++ b/trunk/drivers/pci/setup-res.c @@ -53,7 +53,9 @@ pci_update_resource(struct pci_dev *dev, struct resource *res, int resno) if (resno < 6) { reg = PCI_BASE_ADDRESS_0 + 4 * resno; } else if (resno == PCI_ROM_RESOURCE) { - new |= res->flags & IORESOURCE_ROM_ENABLE; + if (!(res->flags & IORESOURCE_ROM_ENABLE)) + return; + new |= PCI_ROM_ADDRESS_ENABLE; reg = dev->rom_base_reg; } else { /* Hmm, non-standard resource. */