mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 19:29:37 +00:00
drm/vmwgfx/vmwgfx_drv: Fix an error path in vmw_setup_pci_resources()
The devm_memremap() function never returns NULL, it returns error pointers so the test needs to be fixed. Also we need to call pci_release_regions() to avoid a memory leak. Fixes:be4f77ac68
("drm/vmwgfx: Cleanup fifo mmio handling") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Zack Rusin <zackr@vmware.com> Link: https://patchwork.freedesktop.org/patch/msgid/YA6FMboLhnE3uSvb@mwanda (cherry picked from commitf3ebd4e6b6
) Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
This commit is contained in:
parent
6ff92deff7
commit
78e4ba40f1
1 changed files with 3 additions and 2 deletions
|
@ -668,9 +668,10 @@ static int vmw_setup_pci_resources(struct vmw_private *dev,
|
|||
fifo_size,
|
||||
MEMREMAP_WB);
|
||||
|
||||
if (unlikely(dev->fifo_mem == NULL)) {
|
||||
if (IS_ERR(dev->fifo_mem)) {
|
||||
DRM_ERROR("Failed mapping FIFO memory.\n");
|
||||
return -ENOMEM;
|
||||
pci_release_regions(pdev);
|
||||
return PTR_ERR(dev->fifo_mem);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
Loading…
Reference in a new issue