svn commit: r361369 - stable/12/sys/dev/acpica

[Andriy Gapon]

Author: avg
Date: Fri May 22 11:59:50 2020
New Revision: 361369
URL: https://svnweb.freebsd.org/changeset/base/361369

Log:
  MFC r360246: acpi_video: fix a crash in detach with an LCD output
  
  The crash happened because of a video output object was removed from a
  wrong container, crt_units instead of lcd_units.

Modified:
  stable/12/sys/dev/acpica/acpi_video.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/dev/acpica/acpi_video.c
==============================================================================
--- stable/12/sys/dev/acpica/acpi_video.c	Fri May 22 11:57:48 2020	(r361368)
+++ stable/12/sys/dev/acpica/acpi_video.c	Fri May 22 11:59:50 2020	(r361369)
@@ -640,7 +640,10 @@ acpi_video_vo_destroy(struct acpi_video_output *vo)
 
 	switch (vo->adr & DOD_DEVID_MASK) {
 	case DOD_DEVID_MONITOR:
-		voqh = &crt_units;
+		if ((vo->adr & DOD_DEVID_MASK_FULL) == DOD_DEVID_LCD)
+			voqh = &lcd_units;
+		else
+			voqh = &crt_units;
 		break;
 	case DOD_DEVID_TV:
 		voqh = &tv_units;