X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=drivers%2Ftty%2Ftty_io.c;fp=drivers%2Ftty%2Ftty_io.c;h=0065da4b11c1a89eefba4d6c3ac17abb25c9a41d;hb=abfa44b5fd4a2f5d7549005bec465d4823a263ff;hp=6158eae0f64a2e669f6c0d3887e7bc64163419ad;hpb=70d1f365568e0cdbc9f4ab92428e1830fdb09ab0;p=deliverable%2Flinux.git

diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
index 6158eae0f64a..0065da4b11c1 100644
--- a/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
@@ -3257,7 +3257,7 @@ static ssize_t show_cons_active(struct device *dev,
 	ssize_t count = 0;
 
 	console_lock();
-	for (c = console_drivers; c; c = c->next) {
+	for_each_console(c) {
 		if (!c->device)
 			continue;
 		if (!c->write)
@@ -3306,7 +3306,7 @@ int __init tty_init(void)
 	if (IS_ERR(consdev))
 		consdev = NULL;
 	else
-		device_create_file(consdev, &dev_attr_active);
+		WARN_ON(device_create_file(consdev, &dev_attr_active) < 0);
 
 #ifdef CONFIG_VT
 	vty_init(&console_fops);