Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6

[sfrench/cifs-2.6.git] / drivers / acpi / video.c

diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index b9132b5ac0f0f29e73880089addc2ad27655143d..e383d6109ae109c6963d43abe7ca71449e554518 100644 (file)
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -297,11 +297,12 @@ acpi_video_device_set_state(struct acpi_video_device *device, int state)
        int status;
        union acpi_object arg0 = { ACPI_TYPE_INTEGER };
        struct acpi_object_list args = { 1, &arg0 };
+       unsigned long ret;
 
        ACPI_FUNCTION_TRACE("acpi_video_device_set_state");
 
        arg0.integer.value = state;
-       status = acpi_evaluate_integer(device->handle, "_DSS", &args, NULL);
+       status = acpi_evaluate_integer(device->handle, "_DSS", &args, &ret);
 
        return_VALUE(status);
 }