dri-devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Tommi Rantala <tt.rantala@gmail.com>
To: David Airlie <airlied@linux.ie>, dri-devel@lists.freedesktop.org
Subject: [PATCH 6/6] drm/nouveau: free memory allocated with alloc_apertures()
Date: Fri,  9 Nov 2012 11:19:40 +0200	[thread overview]
Message-ID: <1352452780-2029-7-git-send-email-tt.rantala@gmail.com> (raw)
In-Reply-To: <1352452780-2029-1-git-send-email-tt.rantala@gmail.com>

Fix a memory leak by deallocating the memory we got from
alloc_apertures().

Signed-off-by: Tommi Rantala <tt.rantala@gmail.com>
---
 drivers/gpu/drm/nouveau/nouveau_drm.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c
index 0910125..8244863 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)
 	boot = pdev->resource[PCI_ROM_RESOURCE].flags & IORESOURCE_ROM_SHADOW;
 #endif
 	remove_conflicting_framebuffers(aper, "nouveaufb", boot);
+	kfree(aper);
 
 	ret = nouveau_device_create(pdev, nouveau_name(pdev), pci_name(pdev),
 				    nouveau_config, nouveau_debug, &device);
-- 
1.7.9.5

      parent reply	other threads:[~2012-11-09  9:24 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-11-09  9:19 [PATCH 0/6] alloc_apertures() handling fixes Tommi Rantala
2012-11-09  9:19 ` [PATCH 1/6] drm/cirrus: check alloc_apertures() success in cirrus_kick_out_firmware_fb() Tommi Rantala
2012-11-09  9:19 ` [PATCH 2/6] drm/mgag200: check alloc_apertures() success in mga_vram_init() Tommi Rantala
2012-11-09  9:19 ` [PATCH 3/6] drm/mgag200: free memory allocated with alloc_apertures() Tommi Rantala
2012-11-09  9:19 ` [PATCH 4/6] drm/mgag200: remove unneeded aper->count assignment after alloc_apertures() Tommi Rantala
2012-11-09  9:19 ` [PATCH 5/6] drm/radeon: check alloc_apertures() success in radeon_kick_out_firmware_fb() Tommi Rantala
2012-11-09  9:19 ` Tommi Rantala [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1352452780-2029-7-git-send-email-tt.rantala@gmail.com \
    --to=tt.rantala@gmail.com \
    --cc=airlied@linux.ie \
    --cc=dri-devel@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox