releases/4.9.136/efi-fb-correct-pci_std_resource_end-usage.patch

   1 From aa288c63f74327a14ab0188c4def1a44b82faf36 Mon Sep 17 00:00:00 2001
   2 From: Bjorn Helgaas <bhelgaas@google.com>
   3 Date: Fri, 19 May 2017 14:37:53 -0500
   4 Subject: efi/fb: Correct PCI_STD_RESOURCE_END usage
   5
   6 [ Upstream commit 92a16c86299c64f58f320e491977408ba31b8c3c ]
   7
   8 PCI_STD_RESOURCE_END is (confusingly) the index of the last valid BAR, not
   9 the *number* of BARs.  To iterate through all possible BARs, we need to
  10 include PCI_STD_RESOURCE_END.
  11
  12 Fixes: 55d728a40d36 ("efi/fb: Avoid reconfiguration of BAR that covers the framebuffer")
  13 Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
  14 Signed-off-by: Sasha Levin <sashal@kernel.org>
  15 ---
  16  drivers/video/fbdev/efifb.c | 2 +-
  17  1 file changed, 1 insertion(+), 1 deletion(-)
  18
  19 diff --git a/drivers/video/fbdev/efifb.c b/drivers/video/fbdev/efifb.c
  20 index 6f2e729a308f..f4b6d063a4b7 100644
  21 --- a/drivers/video/fbdev/efifb.c
  22 +++ b/drivers/video/fbdev/efifb.c
  23 @@ -375,7 +375,7 @@ static void efifb_fixup_resources(struct pci_dev *dev)
  24         if (!base)
  25                 return;
  26
  27 -       for (i = 0; i < PCI_STD_RESOURCE_END; i++) {
  28 +       for (i = 0; i <= PCI_STD_RESOURCE_END; i++) {
  29                 struct resource *res = &dev->resource[i];
  30
  31                 if (!(res->flags & IORESOURCE_MEM))
  32 --
  33 2.17.1
  34