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

Commit 0a727dea authored by Antonino A. Daplas's avatar Antonino A. Daplas Committed by Linus Torvalds
Browse files

[PATCH] fbcon: 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 1a6600be

drivers/video/console/fbcon.c

+27 −7
Original line number Diff line number Diff line
@@ -133,6 +133,7 @@ static int info_idx = -1; 


/* console rotation */

static int rotate;

static int fbcon_has_sysfs;



static const struct consw fb_con;
@@ -3166,11 +3167,26 @@ static struct class_device_attribute class_device_attrs[] = { 


static int fbcon_init_class_device(void)

{

	int i;

	int i, error = 0;



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

		class_device_create_file(fbcon_class_device,

	fbcon_has_sysfs = 1;



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

		error = class_device_create_file(fbcon_class_device,

						 &class_device_attrs[i]);



		if (error)

			break;

	}



	if (error) {

		while (--i >= 0)

			class_device_remove_file(fbcon_class_device,

						 &class_device_attrs[i]);



		fbcon_has_sysfs = 0;

	}



	return 0;

}
@@ -3279,9 +3295,13 @@ static void __exit fbcon_deinit_class_device(void) 
{

	int i;



	if (fbcon_has_sysfs) {

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

			class_device_remove_file(fbcon_class_device,

						 &class_device_attrs[i]);



		fbcon_has_sysfs = 0;

	}

}



static void __exit fb_console_exit(void)