From 1c49d811ec463ec2c31cd9e1d0941e2d143e9445 Mon Sep 17 00:00:00 2001
From: Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
Date: Wed, 1 Feb 2006 03:06:35 -0800
Subject: [PATCH] --- yaml --- r: 19441 b: refs/heads/master c:
 600b5d163d7434332539cac7be00f649cbbfedcc h: refs/heads/master i:   19439:
 e57bd878b00ddbd09601de95956ec57cf551985c v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/s390/char/con3215.c | 3 ++-
 trunk/drivers/s390/char/con3270.c | 3 ++-
 trunk/drivers/s390/cio/device.c   | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index c25d026fc405..46c389abcf34 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3633b0475eb269dcb85923b23b321505f06b9488
+refs/heads/master: 600b5d163d7434332539cac7be00f649cbbfedcc
diff --git a/trunk/drivers/s390/char/con3215.c b/trunk/drivers/s390/char/con3215.c
index 1f060914cfa4..606f6ad285a0 100644
--- a/trunk/drivers/s390/char/con3215.c
+++ b/trunk/drivers/s390/char/con3215.c
@@ -21,6 +21,7 @@
 #include <linux/init.h>
 #include <linux/console.h>
 #include <linux/interrupt.h>
+#include <linux/err.h>
 
 #include <linux/slab.h>
 #include <linux/bootmem.h>
@@ -864,7 +865,7 @@ con3215_init(void)
 	}
 
 	cdev = ccw_device_probe_console();
-	if (!cdev)
+	if (IS_ERR(cdev))
 		return -ENODEV;
 
 	raw3215[0] = raw = (struct raw3215_info *)
diff --git a/trunk/drivers/s390/char/con3270.c b/trunk/drivers/s390/char/con3270.c
index c570a9f6ce9c..ef607a1de55a 100644
--- a/trunk/drivers/s390/char/con3270.c
+++ b/trunk/drivers/s390/char/con3270.c
@@ -15,6 +15,7 @@
 #include <linux/interrupt.h>
 #include <linux/list.h>
 #include <linux/types.h>
+#include <linux/err.h>
 
 #include <asm/ccwdev.h>
 #include <asm/cio.h>
@@ -597,7 +598,7 @@ con3270_init(void)
 	}
 
 	cdev = ccw_device_probe_console();
-	if (!cdev)
+	if (IS_ERR(cdev))
 		return -ENODEV;
 	rp = raw3270_setup_console(cdev);
 	if (IS_ERR(rp))
diff --git a/trunk/drivers/s390/cio/device.c b/trunk/drivers/s390/cio/device.c
index ceebf08e095b..0b30921ce60d 100644
--- a/trunk/drivers/s390/cio/device.c
+++ b/trunk/drivers/s390/cio/device.c
@@ -1012,7 +1012,7 @@ ccw_device_probe_console(void)
 	int ret;
 
 	if (xchg(&console_cdev_in_use, 1) != 0)
-		return NULL;
+		return ERR_PTR(-EBUSY);
 	sch = cio_probe_console();
 	if (IS_ERR(sch)) {
 		console_cdev_in_use = 0;