# This is a BitKeeper generated diff -Nru style patch. # # ChangeSet # 2005/03/30 22:31:35-05:00 len.brown@intel.com # [ACPI] fix potential NULL dereference in acpi/video.c # # Found-by: Adrian Bunk # Signed-off-by: Len Brown # # drivers/acpi/video.c # 2005/03/30 22:31:27-05:00 len.brown@intel.com +1 -1 # fix double variable definition that could cause NULL dereference # diff -Nru a/drivers/acpi/video.c b/drivers/acpi/video.c --- a/drivers/acpi/video.c 2005-07-09 17:40:54 -04:00 +++ b/drivers/acpi/video.c 2005-07-09 17:40:54 -04:00 @@ -1585,7 +1585,7 @@ ACPI_FUNCTION_TRACE("acpi_video_switch_output"); list_for_each_safe(node, next, &video->video_device_list) { - struct acpi_video_device * dev = container_of(node, struct acpi_video_device, entry); + dev = container_of(node, struct acpi_video_device, entry); status = acpi_video_device_get_state(dev, &state); if (state & 0x2){ dev_next = container_of(node->next, struct acpi_video_device, entry);