summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2005-12-01 07:39:41 +0100
committerLen Brown <len.brown@intel.com>2005-12-01 07:39:41 +0100
commitb7639dafb4e175ddd637425da5ff65f03e08028e (patch)
tree2db15153df1b09b9320a0357696040f59bcebe50 /drivers/acpi
parentPull 5283 into release branch (diff)
parent[ACPI] Fix Null pointer deref in video/lcd/brightness (diff)
downloadlinux-b7639dafb4e175ddd637425da5ff65f03e08028e.tar.xz
linux-b7639dafb4e175ddd637425da5ff65f03e08028e.zip
Pull 5571 into release branch
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/video.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index f051b151580d..d10668f14699 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -812,7 +812,7 @@ acpi_video_device_write_brightness(struct file *file,
ACPI_FUNCTION_TRACE("acpi_video_device_write_brightness");
- if (!dev || count + 1 > sizeof str)
+ if (!dev || !dev->brightness || count + 1 > sizeof str)
return_VALUE(-EINVAL);
if (copy_from_user(str, buffer, count))