Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 75936c65 authored by Dave Airlie's avatar Dave Airlie
Browse files

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
parents 9830e44f 7a444d1f

drivers/gpu/drm/ttm/ttm_agp_backend.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -126,6 +126,7 @@ struct ttm_tt *ttm_agp_tt_create(struct ttm_bo_device *bdev, 
	agp_be->ttm.func = &ttm_agp_func;

	agp_be->ttm.func = &ttm_agp_func;





	if (ttm_tt_init(&agp_be->ttm, bdev, size, page_flags, dummy_read_page)) {

	if (ttm_tt_init(&agp_be->ttm, bdev, size, page_flags, dummy_read_page)) {

		kfree(agp_be);

		return NULL;

		return NULL;

	}

	}

include/drm/ttm/ttm_page_alloc.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -29,6 +29,8 @@ 
#include <drm/ttm/ttm_bo_driver.h>

#include <drm/ttm/ttm_bo_driver.h>

#include <drm/ttm/ttm_memory.h>

#include <drm/ttm/ttm_memory.h>





struct device;



/**

/**

 * Initialize pool allocator.

 * Initialize pool allocator.

 */

 */