projects
/
platform
/
kernel
/
linux-arm64.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
194e3d1
63f0edf
)
Pull video into release branch
author
Len Brown
<len.brown@intel.com>
Wed, 10 Oct 2007 04:29:11 +0000
(
00:29
-0400)
committer
Len Brown
<len.brown@intel.com>
Wed, 10 Oct 2007 04:29:11 +0000
(
00:29
-0400)
Conflicts:
drivers/acpi/video.c
Signed-off-by: Len Brown <len.brown@intel.com>
1
2
drivers/acpi/video.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/acpi/video.c
index
d05891f
,
8a60a3d
..
f31e3c8
---
1
/
drivers/acpi/video.c
---
2
/
drivers/acpi/video.c
+++ b/
drivers/acpi/video.c
@@@
-415,8
-415,11
+415,11
@@@
acpi_video_device_lcd_set_level(struct
arg0.integer.value = level;
- status = acpi_evaluate_object(device->dev->handle, "_BCM", &args, NULL);
+
+ if (device->cap._BCM)
+ status = acpi_evaluate_object(device->dev->handle, "_BCM",
+ &args, NULL);
+ device->brightness->curr = level;
- printk(KERN_DEBUG "set_level status: %x\n", status);
return status;
}