From dd04bfd098985110bd7769cf2191dbefbe68c248 Mon Sep 17 00:00:00 2001
From: Stefan Weinhuber <wein@de.ibm.com>
Date: Thu, 29 Jun 2006 14:57:46 +0200
Subject: [PATCH] --- yaml --- r: 31114 b: refs/heads/master c:
 f45a43d847c96949d22e702879e52385a1547f6b h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/s390/block/dasd_eer.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e533e9ca8ff9..0be38020d276 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 132fab13635a56a8151641671a2f896be00fd215
+refs/heads/master: f45a43d847c96949d22e702879e52385a1547f6b
diff --git a/trunk/drivers/s390/block/dasd_eer.c b/trunk/drivers/s390/block/dasd_eer.c
index 2d8af709947f..9d574ede1b1d 100644
--- a/trunk/drivers/s390/block/dasd_eer.c
+++ b/trunk/drivers/s390/block/dasd_eer.c
@@ -521,6 +521,8 @@ static int dasd_eer_open(struct inode *inp, struct file *filp)
 	unsigned long flags;
 
 	eerb = kzalloc(sizeof(struct eerbuffer), GFP_KERNEL);
+	if (!eerb)
+		return -ENOMEM;
 	eerb->buffer_page_count = eer_pages;
 	if (eerb->buffer_page_count < 1 ||
 	    eerb->buffer_page_count > INT_MAX / PAGE_SIZE) {