aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTommi Rantala <tt.rantala@gmail.com>2012-11-09 04:19:40 -0500
committerDave Airlie <airlied@redhat.com>2012-11-20 01:06:28 -0500
commit83ef7777aa5ffbf08a71e14f0a127de315293113 (patch)
treef92a07a9c9dfbc0c7913238d3553b4e322519150
parent302381511f4b1bc98c6f61ccaec5d8e98ccd0365 (diff)
drm/nouveau: free memory allocated with alloc_apertures()
Fix a memory leak by deallocating the memory we got from alloc_apertures(). Signed-off-by: Tommi Rantala <tt.rantala@gmail.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_drm.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c
index 0910125cbbc3..8244863cc049 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_drm.c
@@ -223,6 +223,7 @@ nouveau_drm_probe(struct pci_dev *pdev, const struct pci_device_id *pent)
223 boot = pdev->resource[PCI_ROM_RESOURCE].flags & IORESOURCE_ROM_SHADOW; 223 boot = pdev->resource[PCI_ROM_RESOURCE].flags & IORESOURCE_ROM_SHADOW;
224#endif 224#endif
225 remove_conflicting_framebuffers(aper, "nouveaufb", boot); 225 remove_conflicting_framebuffers(aper, "nouveaufb", boot);
226 kfree(aper);
226 227
227 ret = nouveau_device_create(pdev, nouveau_name(pdev), pci_name(pdev), 228 ret = nouveau_device_create(pdev, nouveau_name(pdev), pci_name(pdev),
228 nouveau_config, nouveau_debug, &device); 229 nouveau_config, nouveau_debug, &device);