diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-09-14 13:59:28 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-09-14 13:59:28 -0400 |
| commit | 4e8bb027031cb3fd4a6ff6f8793834b810aa0dbc (patch) | |
| tree | 15bb5945ee68e8baf6b383388c900a5914fb5ba3 | |
| parent | d167b83c16662afb759feaca067f7fe7cfb15207 (diff) | |
| download | longterm-queue-4.18-4e8bb027031cb3fd4a6ff6f8793834b810aa0dbc.tar.gz | |
rcar: ctxt refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/PCI-rcar-Fix-a-potential-NULL-pointer-dereference.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/queue/PCI-rcar-Fix-a-potential-NULL-pointer-dereference.patch b/queue/PCI-rcar-Fix-a-potential-NULL-pointer-dereference.patch index 55e83bb..233b25c 100644 --- a/queue/PCI-rcar-Fix-a-potential-NULL-pointer-dereference.patch +++ b/queue/PCI-rcar-Fix-a-potential-NULL-pointer-dereference.patch @@ -1,4 +1,4 @@ -From f0d14edd2ba43b995bef4dd5da5ffe0ae19321a1 Mon Sep 17 00:00:00 2001 +From e60c1bd90e8c42feb619196d4018c3db8527a5c0 Mon Sep 17 00:00:00 2001 From: Kangjie Lu <kjlu@umn.edu> Date: Fri, 15 Mar 2019 02:29:43 -0500 Subject: [PATCH] PCI: rcar: Fix a potential NULL pointer dereference @@ -16,10 +16,10 @@ Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Reviewed-by: Simon Horman <horms+renesas@verge.net.au> diff --git a/drivers/pci/controller/pcie-rcar.c b/drivers/pci/controller/pcie-rcar.c -index a25527185bf1..0004b6457124 100644 +index 6a4e435bd35f..765c39911c0c 100644 --- a/drivers/pci/controller/pcie-rcar.c +++ b/drivers/pci/controller/pcie-rcar.c -@@ -929,6 +929,10 @@ static int rcar_pcie_enable_msi(struct rcar_pcie *pcie) +@@ -931,6 +931,10 @@ static int rcar_pcie_enable_msi(struct rcar_pcie *pcie) /* setup MSI data target */ msi->pages = __get_free_pages(GFP_KERNEL, 0); @@ -29,7 +29,7 @@ index a25527185bf1..0004b6457124 100644 + } base = virt_to_phys((void *)msi->pages); - rcar_pci_write_reg(pcie, lower_32_bits(base) | MSIFE, PCIEMSIALR); + rcar_pci_write_reg(pcie, base | MSIFE, PCIEMSIALR); -- 2.7.4 |