From 5809ea65ed7d94b58aa5b91ef992eaf03da91ca0 Mon Sep 17 00:00:00 2001
From: roel kluin <roel.kluin@gmail.com>
Date: Wed, 9 Sep 2009 05:02:24 +0000
Subject: [PATCH] --- yaml --- r: 166195 b: refs/heads/master c:
 0f3372741f2de8dc85a60be737b519a47b395b85 h: refs/heads/master i:   166193:
 c5284f9aa76261516f2facb2fe8b0a26bf993f20   166191:
 1b8b872a013893d8c5611b0eaafcf3b5994cee74 v: v3

---
 [refs]                          | 2 +-
 trunk/arch/powerpc/kernel/vio.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 87f4b11e3911..6bda34cde08f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 254be490f257fc3f76ca5f869ac8d107b3827025
+refs/heads/master: 0f3372741f2de8dc85a60be737b519a47b395b85
diff --git a/trunk/arch/powerpc/kernel/vio.c b/trunk/arch/powerpc/kernel/vio.c
index bc7b41edbdfc..1b4f674ad7c4 100644
--- a/trunk/arch/powerpc/kernel/vio.c
+++ b/trunk/arch/powerpc/kernel/vio.c
@@ -1054,6 +1054,8 @@ static struct iommu_table *vio_build_iommu_table(struct vio_dev *dev)
 		return NULL;
 
 	tbl = kmalloc(sizeof(*tbl), GFP_KERNEL);
+	if (tbl == NULL)
+		return NULL;
 
 	of_parse_dma_window(dev->dev.archdata.of_node, dma_window,
 			    &tbl->it_index, &offset, &size);