diff options
| author | Jody McIntyre <scjody@modernduck.com> | 2005-12-05 15:52:41 -0500 |
|---|---|---|
| committer | Jody McIntyre <scjody@modernduck.com> | 2005-12-05 15:52:41 -0500 |
| commit | c4fc108a8275f5eb77c9859725643a6870d20ef6 (patch) | |
| tree | de7ce4af8e49ad2504fc270594124ec8ec874857 /drivers/acpi/video.c | |
| parent | 741854e4f9a23421e194df8d846899172ff393d6 (diff) | |
| parent | e4f5c82a92c2a546a16af1614114eec19120e40a (diff) | |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/acpi/video.c')
| -rw-r--r-- | drivers/acpi/video.c | 2 |
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, | |||
| 812 | 812 | ||
| 813 | ACPI_FUNCTION_TRACE("acpi_video_device_write_brightness"); | 813 | ACPI_FUNCTION_TRACE("acpi_video_device_write_brightness"); |
| 814 | 814 | ||
| 815 | if (!dev || count + 1 > sizeof str) | 815 | if (!dev || !dev->brightness || count + 1 > sizeof str) |
| 816 | return_VALUE(-EINVAL); | 816 | return_VALUE(-EINVAL); |
| 817 | 817 | ||
| 818 | if (copy_from_user(str, buffer, count)) | 818 | if (copy_from_user(str, buffer, count)) |