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

Collapse All | Expand All

(-)b/sys/dev/acpica/acpi_cmbat.c (-2 / +11 lines)
Lines 398-405 acpi_cmbat_get_bix(void *arg) Link Here
398
	        sc->bix.rev != ACPI_BIX_REV_1)
398
	        sc->bix.rev != ACPI_BIX_REV_1)
399
		ACPI_BIX_REV_MISMATCH_ERR(sc->bix.rev, ACPI_BIX_REV_1);
399
		ACPI_BIX_REV_MISMATCH_ERR(sc->bix.rev, ACPI_BIX_REV_1);
400
	} else if (ACPI_PKG_VALID_EQ(res, 20)) {/* ACPI 4.0 _BIX */
400
	} else if (ACPI_PKG_VALID_EQ(res, 20)) {/* ACPI 4.0 _BIX */
401
	    if (sc->bix.rev != ACPI_BIX_REV_0)
401
	    /*
402
		ACPI_BIX_REV_MISMATCH_ERR(sc->bix.rev, ACPI_BIX_REV_0);
402
	     * Some models claim to be rev.1, but have a _BIX with only 20
403
	     * members. Be lenient and treat this as a valid rev.0 _BIX.
404
	     */
405
	    if (sc->bix.rev != ACPI_BIX_REV_0) {
406
		ACPI_VPRINT(dev, acpi_device_get_parent_softc(dev),
407
		    "_BIX containing too few objects for revision %u. "
408
		    "Treating as revision %u instead.\n",
409
		    sc->bix.rev, ACPI_BIX_REV_0);
410
		sc->bix.rev = ACPI_BIX_REV_0;
411
            }
403
	} else if (ACPI_PKG_VALID(res, 22)) {
412
	} else if (ACPI_PKG_VALID(res, 22)) {
404
	    /* _BIX with 22 or more members. */
413
	    /* _BIX with 22 or more members. */
405
	    if (ACPI_BIX_REV_MIN_CHECK(sc->bix.rev, ACPI_BIX_REV_1 + 1)) {
414
	    if (ACPI_BIX_REV_MIN_CHECK(sc->bix.rev, ACPI_BIX_REV_1 + 1)) {

Return to bug 252030