Merge remote branch 'anholt/drm-intel-next' into drm-next

* anholt/drm-intel-next: (515 commits)
  drm/i915: Fix out of tree builds
  drm/i915: move fence lru to struct drm_i915_fence_reg
  drm/i915: don't allow tiling changes on pinned buffers v2
  drm/i915: Be extra careful about A/D matching for multifunction SDVO
  drm/i915: Fix DDC bus selection for multifunction SDVO
  drm/i915: cleanup mode setting before unmapping registers
  drm/i915: Make fbc control wrapper functions
  drm/i915: Wait for the GPU whilst shrinking, if truly desperate.
  drm/i915: Use spatio-temporal dithering on PCH
  [MTD] Remove zero-length files mtdbdi.c and internal.ho
  pata_pcmcia / ide-cs: Fix bad hashes for Transcend and kingston IDs
  libata: Fix several inaccuracies in developer's guide
  slub: Fix bad boundary check in init_kmem_cache_nodes()
  raid6: fix recovery performance regression
  KEYS: call_sbin_request_key() must write lock keyrings before modifying them
  KEYS: Use RCU dereference wrappers in keyring key type code
  KEYS: find_keyring_by_name() can gain access to a freed keyring
  ALSA: hda: Fix 0 dB for Packard Bell models using Conexant CX20549 (Venice)
  ALSA: hda - Add quirk for Dell Inspiron 19T using a Conexant CX20582
  ALSA: take tu->qlock with irqs disabled
  ...

1 files changed, 7 insertions, 16 deletions

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 882bd8d29fe3..c82548afcd5c 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -174,19 +174,14 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
         pci_read_config_dword(dev, pos, &sz);
         pci_write_config_dword(dev, pos, l);
 
-        if (!sz)
-                goto fail;      /* BAR not implemented */
-
         /*
          * All bits set in sz means the device isn't working properly.
-         * If it's a memory BAR or a ROM, bit 0 must be clear; if it's
-         * an io BAR, bit 1 must be clear.
+         * If the BAR isn't implemented, all bits must be 0.  If it's a
+         * memory BAR or a ROM, bit 0 must be clear; if it's an io BAR, bit
+         * 1 must be clear.
          */
-        if (sz == 0xffffffff) {
-                dev_err(&dev->dev, "reg %x: invalid size %#x; broken device?\n",
-                        pos, sz);
+        if (!sz || sz == 0xffffffff)
                 goto fail;
-        }
 
         /*
          * I don't know how l can have all bits set.  Copied from old code.
@@ -249,17 +244,13 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
                                    pos, res);
                 }
         } else {
-                u32 size = pci_size(l, sz, mask);
+                sz = pci_size(l, sz, mask);
 
-                if (!size) {
-                        dev_err(&dev->dev, "reg %x: invalid size "
-                                "(l %#x sz %#x mask %#x); broken device?",
-                                pos, l, sz, mask);
+                if (!sz)
                         goto fail;
-                }
 
                 res->start = l;
-                res->end = l + size;
+                res->end = l + sz;
 
                 dev_printk(KERN_DEBUG, &dev->dev, "reg %x: %pR\n", pos, res);
         }