[1/2] drm/ast: Fix incorrect free on ioregs

Submitted by Sam Bobroff on Nov. 5, 2018, 5:57 a.m.

Details

Message ID 9e419efe28abb38b3935ee33d886630be43f0bf3.1541397462.git.sbobroff@linux.ibm.com
State Accepted
Commit dc25ab067645eabd037f1a23d49a666f9e0b8c68
Headers show
Series "Two AST driver fixes" ( rev: 1 ) in DRI devel

Not browsing as part of any series.

Commit Message

Sam Bobroff Nov. 5, 2018, 5:57 a.m.
If the platform has no IO space, ioregs is placed next to the already
allocated regs. In this case, it should not be separately freed.

This prevents a kernel warning from __vunmap "Trying to vfree()
nonexistent vm area" when unloading the driver.

Fixes: 0dd68309b9c5 ("drm/ast: Try to use MMIO registers when PIO isn't supported")

Signed-off-by: Sam Bobroff <sbobroff@linux.ibm.com>
---
 drivers/gpu/drm/ast/ast_main.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/drivers/gpu/drm/ast/ast_main.c b/drivers/gpu/drm/ast/ast_main.c
index dac355812adc..373700c05a00 100644
--- a/drivers/gpu/drm/ast/ast_main.c
+++ b/drivers/gpu/drm/ast/ast_main.c
@@ -583,7 +583,8 @@  void ast_driver_unload(struct drm_device *dev)
 	drm_mode_config_cleanup(dev);
 
 	ast_mm_fini(ast);
-	pci_iounmap(dev->pdev, ast->ioregs);
+	if (ast->ioregs != ast->regs + AST_IO_MM_OFFSET)
+		pci_iounmap(dev->pdev, ast->ioregs);
 	pci_iounmap(dev->pdev, ast->regs);
 	kfree(ast);
 }