Author: avg
Date: Fri Apr 24 09:32:20 2020
New Revision: 360246
URL: https://svnweb.freebsd.org/changeset/base/360246
Log:
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.
MFC after: 1 week
Modified:
head/sys/dev/acpica/acpi_video.c
Modified: head/sys/dev/acpica/acpi_video.c
==============================================================================
--- head/sys/dev/acpica/acpi_video.c Fri Apr 24 08:31:31 2020
(r360245)
+++ head/sys/dev/acpica/acpi_video.c Fri Apr 24 09:32:20 2020
(r360246)
@@ -642,7 +642,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;
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
