lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] fbdev: Honor the return value of device_create_file

Browse Source 
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 928e964f26
commit 1a6600be3e
2 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
drivers/video/fbsysfs.c
View File

@@ -20,6 +20,8 @@
#include <linux/console.h> #include <linux/console.h>
#include <linux/module.h> #include <linux/module.h>
#define FB_SYSFS_FLAG_ATTR 1
/** /**
* framebuffer_alloc - creates a new frame buffer info structure * framebuffer_alloc - creates a new frame buffer info structure
* *
@@ -483,12 +485,27 @@ static struct class_device_attribute class_device_attrs[] = {
int fb_init_class_device(struct fb_info *fb_info) int fb_init_class_device(struct fb_info *fb_info)
{ {
unsigned int i; int i, error = 0;
class_set_devdata(fb_info->class_device, fb_info); class_set_devdata(fb_info->class_device, fb_info);
for (i = 0; i < ARRAY_SIZE(class_device_attrs); i++) fb_info->class_flag |= FB_SYSFS_FLAG_ATTR;
class_device_create_file(fb_info->class_device,
&class_device_attrs[i]); for (i = 0; i < ARRAY_SIZE(class_device_attrs); i++) {
error = class_device_create_file(fb_info->class_device,
&class_device_attrs[i]);
if (error)
break;
}
if (error) {
while (--i >= 0)
class_device_remove_file(fb_info->class_device,
&class_device_attrs[i]);
fb_info->class_flag &= ~FB_SYSFS_FLAG_ATTR;
}
return 0; return 0;
} }
@@ -496,9 +513,13 @@ void fb_cleanup_class_device(struct fb_info *fb_info)
{ {
unsigned int i; unsigned int i;
for (i = 0; i < ARRAY_SIZE(class_device_attrs); i++) if (fb_info->class_flag & FB_SYSFS_FLAG_ATTR) {
class_device_remove_file(fb_info->class_device, for (i = 0; i < ARRAY_SIZE(class_device_attrs); i++)
&class_device_attrs[i]); class_device_remove_file(fb_info->class_device,
&class_device_attrs[i]);
fb_info->class_flag &= ~FB_SYSFS_FLAG_ATTR;
}
} }
#ifdef CONFIG_FB_BACKLIGHT #ifdef CONFIG_FB_BACKLIGHT

1
include/linux/fb.h
View File

@@ -776,6 +776,7 @@ struct fb_info {
struct fb_ops *fbops; struct fb_ops *fbops;
struct device *device; struct device *device;
struct class_device *class_device; /* sysfs per device attrs */ struct class_device *class_device; /* sysfs per device attrs */
int class_flag; /* private sysfs flags */
#ifdef CONFIG_FB_TILEBLITTING #ifdef CONFIG_FB_TILEBLITTING
struct fb_tile_ops *tileops; /* Tile Blitting */ struct fb_tile_ops *tileops; /* Tile Blitting */
#endif #endif