OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[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: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Antonino A. Daplas 2006-10-03 01:14:50 -07:00 committed by Linus Torvalds
parent 1a6600be3e
commit 0a727dea77
1 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
drivers/video/console/fbcon.c
View File

@ -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;
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;
}
for (i = 0; i < ARRAY_SIZE(class_device_attrs); i++)
class_device_create_file(fbcon_class_device,
&class_device_attrs[i]);
return 0;
}
@ -3279,9 +3295,13 @@ static void __exit fbcon_deinit_class_device(void)
{
int i;
for (i = 0; i < ARRAY_SIZE(class_device_attrs); i++)
class_device_remove_file(fbcon_class_device,
&class_device_attrs[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)