[PATCH] s390: ccw_device_probe_console return value

The return code of ccw_device_probe_console() is not properly handled.  It
should only return a valid ccw device pointer or a error value converted by
ERR_PTR.  Fix the console driver code to check with IS_ERR instead against
NULL.

Signed-off-by: Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index ceebf08e095b..0b30921ce60d 100644
--- a/drivers/s390/cio/device.c
+++ b/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;