[PATCH] s390: ccw_device_probe_console return value (600b5d16) · Commits · 戴 / test

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>

drivers/s390/char/con3215.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -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 *)

drivers/s390/char/con3270.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -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))

drivers/s390/cio/device.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;

Admin message