From a89fc7614c1a6a1be5eb27729ff946acee7f82ca Mon Sep 17 00:00:00 2001
From: Christian Borntraeger <cborntra@de.ibm.com>
Date: Fri, 15 Dec 2006 17:18:10 +0100
Subject: [PATCH] --- yaml --- r: 44607 b: refs/heads/master c:
 86b22470f68528c68cb25dbd58886040e1917494 h: refs/heads/master i:   44605:
 3dd0b1f7d949668c18fa8859ecf534f5f1655ff2   44603:
 0cfb0c969663eae0a2b031b498154bf867a7ee7c   44599:
 6c337b9bc0f14ec67e086eedc2291a1a81abe77c   44591:
 13a0cab1b0f8edc9454c6c6c1cb8485b00a8a080   44575:
 00ca203221d644ae827ce6e426f0d3947ce94236   44543:
 5b94516a0625f11d8cc10cc434544b900e7a419e v: v3

---
 [refs]                             | 2 +-
 trunk/arch/s390/hypfs/hypfs_diag.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 9b453fb1ce34..aba07321b217 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 240bfbef67e9ae174190b231e63ee3c0f9f02d8a
+refs/heads/master: 86b22470f68528c68cb25dbd58886040e1917494
diff --git a/trunk/arch/s390/hypfs/hypfs_diag.c b/trunk/arch/s390/hypfs/hypfs_diag.c
index 443fa377d9ff..2782cf9da5b4 100644
--- a/trunk/arch/s390/hypfs/hypfs_diag.c
+++ b/trunk/arch/s390/hypfs/hypfs_diag.c
@@ -379,7 +379,7 @@ static void *diag204_alloc_vbuf(int pages)
 static void *diag204_alloc_rbuf(void)
 {
 	diag204_buf = (void*)__get_free_pages(GFP_KERNEL,0);
-	if (diag204_buf)
+	if (!diag204_buf)
 		return ERR_PTR(-ENOMEM);
 	diag204_buf_pages = 1;
 	return diag204_buf;
@@ -521,7 +521,7 @@ __init int hypfs_diag_init(void)
 	}
 	rc = diag224_get_name_table();
 	if (rc) {
-		diag224_delete_name_table();
+		diag204_free_buffer();
 		printk(KERN_ERR "hypfs: could not get name table.\n");
 	}
 	return rc;