summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2014-02-18 23:21:26 +0100
committerDave Airlie <airlied@redhat.com>2014-02-18 23:21:26 +0100
commit75936c65dda54a08d9124f24f8725f86a4adc286 (patch)
tree39e1a39f984bf450ee37a1ded6113d0b998b3a6d /drivers
parentMerge tag 'vmwgfx-fixes-3.14-2014-02-18' of git://people.freedesktop.org/~tho... (diff)
parentdrm/ttm: Fix memory leak in ttm_agp_backend.c (diff)
downloadlinux-75936c65dda54a08d9124f24f8725f86a4adc286.tar.xz
linux-75936c65dda54a08d9124f24f8725f86a4adc286.zip
Merge tag 'ttm-fixes-3.14-2014-02-18' of git://people.freedesktop.org/~thomash/linux into drm-fixes
Pull request of 2014-02-18 One compile fix and one memory leak. * tag 'ttm-fixes-3.14-2014-02-18' of git://people.freedesktop.org/~thomash/linux: drm/ttm: Fix memory leak in ttm_agp_backend.c drm/ttm: declare 'struct device' in ttm_page_alloc.h
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/ttm/ttm_agp_backend.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_agp_backend.c b/drivers/gpu/drm/ttm/ttm_agp_backend.c
index 3302f99e7497..764be36397fd 100644
--- a/drivers/gpu/drm/ttm/ttm_agp_backend.c
+++ b/drivers/gpu/drm/ttm/ttm_agp_backend.c
@@ -126,6 +126,7 @@ struct ttm_tt *ttm_agp_tt_create(struct ttm_bo_device *bdev,
agp_be->ttm.func = &ttm_agp_func;
if (ttm_tt_init(&agp_be->ttm, bdev, size, page_flags, dummy_read_page)) {
+ kfree(agp_be);
return NULL;
}