diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-02-19 08:21:26 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-02-19 08:21:26 +1000 |
| commit | 75936c65dda54a08d9124f24f8725f86a4adc286 (patch) | |
| tree | 39e1a39f984bf450ee37a1ded6113d0b998b3a6d | |
| parent | 9830e44f560de2f9f9453bb7f0eb2979b36ed139 (diff) | |
| parent | 7a444d1f0b557c68f847050b33713ae7b56f25e7 (diff) | |
| download | linux-75936c65dda54a08d9124f24f8725f86a4adc286.tar.gz linux-75936c65dda54a08d9124f24f8725f86a4adc286.tar.bz2 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
| -rw-r--r-- | drivers/gpu/drm/ttm/ttm_agp_backend.c | 1 | ||||
| -rw-r--r-- | include/drm/ttm/ttm_page_alloc.h | 2 |
2 files changed, 3 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; } diff --git a/include/drm/ttm/ttm_page_alloc.h b/include/drm/ttm/ttm_page_alloc.h index d1f61bfe0ebe..49a828425fa2 100644 --- a/include/drm/ttm/ttm_page_alloc.h +++ b/include/drm/ttm/ttm_page_alloc.h @@ -29,6 +29,8 @@ #include <drm/ttm/ttm_bo_driver.h> #include <drm/ttm/ttm_memory.h> +struct device; + /** * Initialize pool allocator. */ |