From a9817a29816c32f7fde6592bd38f0b6832b20543 Mon Sep 17 00:00:00 2001
From: Julien Brunel <brunel@diku.dk>
Date: Thu, 21 Aug 2008 19:46:30 +0200
Subject: [PATCH] --- yaml --- r: 108955 b: refs/heads/master c:
 0983e56835cbf4796e8f5780c549c32ac1c3afac h: refs/heads/master i:   108953:
 88dbbb89b84db425911139899e00bd3af831da0d   108951:
 87230933b11d330ed0362faca94396f70b23486c v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/s390/block/dasd_eer.c | 3 ++-
 trunk/drivers/s390/char/tape_char.c | 2 +-
 trunk/drivers/s390/char/tape_std.c  | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index ec738f3abdc6..97220d945d09 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6a55617ed5d1aa62b850de2cf66f5ede2eef4825
+refs/heads/master: 0983e56835cbf4796e8f5780c549c32ac1c3afac
diff --git a/trunk/drivers/s390/block/dasd_eer.c b/trunk/drivers/s390/block/dasd_eer.c
index 29da4413ad43..bf512ac75b9e 100644
--- a/trunk/drivers/s390/block/dasd_eer.c
+++ b/trunk/drivers/s390/block/dasd_eer.c
@@ -16,6 +16,7 @@
 #include <linux/poll.h>
 #include <linux/mutex.h>
 #include <linux/smp_lock.h>
+#include <linux/err.h>
 
 #include <asm/uaccess.h>
 #include <asm/atomic.h>
@@ -457,7 +458,7 @@ int dasd_eer_enable(struct dasd_device *device)
 
 	cqr = dasd_kmalloc_request("ECKD", 1 /* SNSS */,
 				   SNSS_DATA_SIZE, device);
-	if (!cqr)
+	if (IS_ERR(cqr))
 		return -ENOMEM;
 
 	cqr->startdev = device;
diff --git a/trunk/drivers/s390/char/tape_char.c b/trunk/drivers/s390/char/tape_char.c
index 687720b552d1..be0ce2215c8d 100644
--- a/trunk/drivers/s390/char/tape_char.c
+++ b/trunk/drivers/s390/char/tape_char.c
@@ -109,7 +109,7 @@ tapechar_check_idalbuffer(struct tape_device *device, size_t block_size)
 
 	/* The current idal buffer is not correct. Allocate a new one. */
 	new = idal_buffer_alloc(block_size, 0);
-	if (new == NULL)
+	if (IS_ERR(new))
 		return -ENOMEM;
 
 	if (device->char_data.idal_buf != NULL)
diff --git a/trunk/drivers/s390/char/tape_std.c b/trunk/drivers/s390/char/tape_std.c
index 2a1af4e60be0..cc8fd781ee22 100644
--- a/trunk/drivers/s390/char/tape_std.c
+++ b/trunk/drivers/s390/char/tape_std.c
@@ -248,7 +248,7 @@ tape_std_mtsetblk(struct tape_device *device, int count)
 
 	/* Allocate a new idal buffer. */
 	new = idal_buffer_alloc(count, 0);
-	if (new == NULL)
+	if (IS_ERR(new))
 		return -ENOMEM;
 	if (device->char_data.idal_buf != NULL)
 		idal_buffer_free(device->char_data.idal_buf);