View | Details | Raw Unified | Return to bug 248746 | Differences between
and this patch

Collapse All | Expand All

(-)sys/dev/acpica/acpi_apei.c (-2 / +10 lines)
Lines 550-560 apei_identify(driver_t *driver, device_t parent) Link Here
550
{
550
{
551
	device_t	child;
551
	device_t	child;
552
	int		found;
552
	int		found;
553
	ACPI_TABLE_HEADER *hest;
554
	ACPI_STATUS	status;
553
555
554
	if (acpi_disabled("apei"))
556
	if (acpi_disabled("apei"))
555
		return;
557
		return;
556
	if (acpi_find_table(ACPI_SIG_HEST) == 0)
558
	status = AcpiGetTable(ACPI_SIG_HEST, 0, &hest);
559
	if (ACPI_FAILURE(status))
557
		return;
560
		return;
561
	AcpiPutTable(hest);
558
	/* Only one APEI device can exist. */
562
	/* Only one APEI device can exist. */
559
	if (devclass_get_device(apei_devclass, 0))
563
	if (devclass_get_device(apei_devclass, 0))
560
		return;
564
		return;
Lines 573-584 apei_identify(driver_t *driver, device_t parent) Link Here
573
static int
577
static int
574
apei_probe(device_t dev)
578
apei_probe(device_t dev)
575
{
579
{
580
	ACPI_TABLE_HEADER *hest;
581
	ACPI_STATUS	status;
576
	int rv;
582
	int rv;
577
583
578
	if (acpi_disabled("apei"))
584
	if (acpi_disabled("apei"))
579
		return (ENXIO);
585
		return (ENXIO);
580
	if (acpi_find_table(ACPI_SIG_HEST) == 0)
586
	status = AcpiGetTable(ACPI_SIG_HEST, 0, &hest);
587
	if (ACPI_FAILURE(status))
581
		return (ENXIO);
588
		return (ENXIO);
589
	AcpiPutTable(hest);
582
	if (acpi_get_handle(dev) != NULL)
590
	if (acpi_get_handle(dev) != NULL)
583
		rv = ACPI_ID_PROBE(device_get_parent(dev), dev, apei_ids, NULL);
591
		rv = ACPI_ID_PROBE(device_get_parent(dev), dev, apei_ids, NULL);
584
	else
592
	else

Return to bug 248746