diff options
author | Len Brown <len.brown@intel.com> | 2006-12-20 02:52:17 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2006-12-20 02:52:17 -0500 |
commit | 40b20c257a13c5a526ac540bc5e43d0fdf29792a (patch) | |
tree | e125c0c2b557e36cb0c3a2c3726fadbcdae0dca3 /drivers/video/backlight | |
parent | cece901481bafbf14de8cbd3a89ae869ea881055 (diff) | |
parent | a8274d57afb83e4954ddcb3f8b7dd1c03a379bd4 (diff) | |
download | linux-40b20c257a13c5a526ac540bc5e43d0fdf29792a.tar.gz linux-40b20c257a13c5a526ac540bc5e43d0fdf29792a.tar.bz2 linux-40b20c257a13c5a526ac540bc5e43d0fdf29792a.zip |
Pull platform-drivers into test branch
Diffstat (limited to 'drivers/video/backlight')
-rw-r--r-- | drivers/video/backlight/backlight.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/video/backlight/backlight.c b/drivers/video/backlight/backlight.c index db8c191b1201..9601bfe309ac 100644 --- a/drivers/video/backlight/backlight.c +++ b/drivers/video/backlight/backlight.c @@ -216,8 +216,10 @@ static const struct class_device_attribute bl_class_device_attributes[] = { * Creates and registers new backlight class_device. Returns either an * ERR_PTR() or a pointer to the newly allocated device. */ -struct backlight_device *backlight_device_register(const char *name, void *devdata, - struct backlight_properties *bp) +struct backlight_device *backlight_device_register(const char *name, + struct device *dev, + void *devdata, + struct backlight_properties *bp) { int i, rc; struct backlight_device *new_bd; @@ -232,6 +234,7 @@ struct backlight_device *backlight_device_register(const char *name, void *devda new_bd->props = bp; memset(&new_bd->class_dev, 0, sizeof(new_bd->class_dev)); new_bd->class_dev.class = &backlight_class; + new_bd->class_dev.dev = dev; strlcpy(new_bd->class_dev.class_id, name, KOBJ_NAME_LEN); class_set_devdata(&new_bd->class_dev, devdata); |