reduce the last commit to its essence; the rest was
not so helpful
This commit is contained in:
parent
c3c1fc597e
commit
fbdec13c62
|
@ -1,4 +1,4 @@
|
||||||
/* $NetBSD: fdc_acpi.c,v 1.25 2005/07/11 14:40:00 christos Exp $ */
|
/* $NetBSD: fdc_acpi.c,v 1.26 2005/07/11 18:31:12 drochner Exp $ */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2002 Jared D. McNeill <jmcneill@invisible.ca>
|
* Copyright (c) 2002 Jared D. McNeill <jmcneill@invisible.ca>
|
||||||
|
@ -31,7 +31,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <sys/cdefs.h>
|
#include <sys/cdefs.h>
|
||||||
__KERNEL_RCSID(0, "$NetBSD: fdc_acpi.c,v 1.25 2005/07/11 14:40:00 christos Exp $");
|
__KERNEL_RCSID(0, "$NetBSD: fdc_acpi.c,v 1.26 2005/07/11 18:31:12 drochner Exp $");
|
||||||
|
|
||||||
#include "rnd.h"
|
#include "rnd.h"
|
||||||
|
|
||||||
|
@ -236,7 +236,7 @@ fdc_acpi_enumerate(struct fdc_acpi_softc *asc)
|
||||||
ACPI_BUFFER abuf;
|
ACPI_BUFFER abuf;
|
||||||
ACPI_STATUS rv;
|
ACPI_STATUS rv;
|
||||||
UINT32 *p;
|
UINT32 *p;
|
||||||
int i, drives;
|
int i, drives = -1;
|
||||||
|
|
||||||
rv = acpi_eval_struct(asc->sc_node->ad_handle, "_FDE", &abuf);
|
rv = acpi_eval_struct(asc->sc_node->ad_handle, "_FDE", &abuf);
|
||||||
if (ACPI_FAILURE(rv)) {
|
if (ACPI_FAILURE(rv)) {
|
||||||
|
@ -244,7 +244,7 @@ fdc_acpi_enumerate(struct fdc_acpi_softc *asc)
|
||||||
printf("%s: failed to evaluate _FDE: %s\n",
|
printf("%s: failed to evaluate _FDE: %s\n",
|
||||||
sc->sc_dev.dv_xname, AcpiFormatException(rv));
|
sc->sc_dev.dv_xname, AcpiFormatException(rv));
|
||||||
#endif
|
#endif
|
||||||
return -1;
|
return drives;
|
||||||
}
|
}
|
||||||
fde = (ACPI_OBJECT *)abuf.Pointer;
|
fde = (ACPI_OBJECT *)abuf.Pointer;
|
||||||
if (fde->Type != ACPI_TYPE_BUFFER) {
|
if (fde->Type != ACPI_TYPE_BUFFER) {
|
||||||
|
|
Loading…
Reference in New Issue