diff --git a/[refs] b/[refs] index 147ba9c37b68..18d1b9fed46d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fdc136ccd3332938e989439c025c363f8479f3e6 +refs/heads/master: 6665bda76461308868bd1e52caf627f4cb29ed32 diff --git a/trunk/drivers/acpi/video.c b/trunk/drivers/acpi/video.c index bd4887518373..724149d72d91 100644 --- a/trunk/drivers/acpi/video.c +++ b/trunk/drivers/acpi/video.c @@ -323,7 +323,7 @@ acpi_video_device_lcd_query_levels(struct acpi_video_device *device, if (!ACPI_SUCCESS(status)) return_VALUE(status); obj = (union acpi_object *)buffer.pointer; - if (!obj && (obj->type != ACPI_TYPE_PACKAGE)) { + if (!obj || (obj->type != ACPI_TYPE_PACKAGE)) { ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid _BCL data\n")); status = -EFAULT; goto err;