Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 928e964f authored by Antonino A. Daplas's avatar Antonino A. Daplas Committed by Linus Torvalds
Browse files

[PATCH] vt: Honor the return value of device_create_file 



Check the return value of device_create_file().  If return is 'fail', remove
attributes by calling device_remove_file().

Signed-off-by: default avatarAntonino Daplas <adaplas@pol.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 212f2639

drivers/char/vt.c

+24 −7
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ 


#define CON_DRIVER_FLAG_MODULE 1

#define CON_DRIVER_FLAG_INIT   2

#define CON_DRIVER_FLAG_ATTR   4



struct con_driver {

	const struct consw *con;
@@ -3070,22 +3071,37 @@ static struct class_device_attribute class_device_attrs[] = { 
static int vtconsole_init_class_device(struct con_driver *con)

{

	int i;

	int error = 0;



	con->flag |= CON_DRIVER_FLAG_ATTR;

	class_set_devdata(con->class_dev, con);

	for (i = 0; i < ARRAY_SIZE(class_device_attrs); i++)

		class_device_create_file(con->class_dev,

	for (i = 0; i < ARRAY_SIZE(class_device_attrs); i++) {

		error = class_device_create_file(con->class_dev,

					 &class_device_attrs[i]);

		if (error)

			break;

	}



	return 0;

	if (error) {

		while (--i >= 0)

			class_device_remove_file(con->class_dev,

					 &class_device_attrs[i]);

		con->flag &= ~CON_DRIVER_FLAG_ATTR;

	}



	return error;

}



static void vtconsole_deinit_class_device(struct con_driver *con)

{

	int i;



	if (con->flag & CON_DRIVER_FLAG_ATTR) {

		for (i = 0; i < ARRAY_SIZE(class_device_attrs); i++)

			class_device_remove_file(con->class_dev,

						 &class_device_attrs[i]);

		con->flag &= ~CON_DRIVER_FLAG_ATTR;

	}

}



/**
@@ -3184,6 +3200,7 @@ int register_con_driver(const struct consw *csw, int first, int last) 
	} else {

		vtconsole_init_class_device(con_driver);

	}



err:

	release_console_sem();

	module_put(owner);