projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'backlight-for-linus-3.17' of git://git.kernel.org/pub/scm/linux/kernel...
[cascardo/linux.git]
/
drivers
/
video
/
backlight
/
backlight.c
diff --git
a/drivers/video/backlight/backlight.c
b/drivers/video/backlight/backlight.c
index
4280890
..
bddc8b1
100644
(file)
--- a/
drivers/video/backlight/backlight.c
+++ b/
drivers/video/backlight/backlight.c
@@
-223,6
+223,8
@@
static ssize_t actual_brightness_show(struct device *dev,
mutex_lock(&bd->ops_lock);
if (bd->ops && bd->ops->get_brightness)
rc = sprintf(buf, "%d\n", bd->ops->get_brightness(bd));
+ else
+ rc = sprintf(buf, "%d\n", bd->props.brightness);
mutex_unlock(&bd->ops_lock);
return rc;