From: Jerome Glisse <jglisse@redhat.com>
Date: Tue, 1 Nov 2011 23:07:31 +0000 (-0400)
Subject: drm/ttm: test for dma_address array allocation failure
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f9517e63ffae6a1062a0a2ac4eea60be49b9dfd4;p=linux-beck.git

drm/ttm: test for dma_address array allocation failure

Signed-off-by: Jerome Glisse <jglisse@redhat.com>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>
---

diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c
index 90527a2ce04c..54bbbadba93c 100644
--- a/drivers/gpu/drm/ttm/ttm_tt.c
+++ b/drivers/gpu/drm/ttm/ttm_tt.c
@@ -320,7 +320,7 @@ struct ttm_tt *ttm_tt_create(struct ttm_bo_device *bdev, unsigned long size,
 	ttm->dummy_read_page = dummy_read_page;
 
 	ttm_tt_alloc_page_directory(ttm);
-	if (!ttm->pages) {
+	if (!ttm->pages || !ttm->dma_address) {
 		ttm_tt_destroy(ttm);
 		printk(KERN_ERR TTM_PFX "Failed allocating page table\n");
 		return NULL;