Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/pci Don't try to unmap unmapped space in case of fai...



details:   https://anonhg.NetBSD.org/src/rev/cf1f8442483d
branches:  trunk
changeset: 475977:cf1f8442483d
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Wed Sep 01 15:17:07 1999 +0000

description:
Don't try to unmap unmapped space in case of failure in
pciide_mapregs_compat(). From OpenBSD.

diffstat:

 sys/dev/pci/pciide.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (31 lines):

diff -r 2bffe0fae2db -r cf1f8442483d sys/dev/pci/pciide.c
--- a/sys/dev/pci/pciide.c      Wed Sep 01 11:54:32 1999 +0000
+++ b/sys/dev/pci/pciide.c      Wed Sep 01 15:17:07 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pciide.c,v 1.42 1999/08/30 12:49:21 bouyer Exp $       */
+/*     $NetBSD: pciide.c,v 1.43 1999/09/01 15:17:07 bouyer Exp $       */
 
 
 /*
@@ -554,7 +554,7 @@
            PCIIDE_COMPAT_CMD_SIZE, 0, &wdc_cp->cmd_ioh) != 0) {
                printf("%s: couldn't map %s channel cmd regs\n",
                    sc->sc_wdcdev.sc_dev.dv_xname, cp->name);
-               rv = 0;
+               return (0);
        }
 
        wdc_cp->ctl_iot = pa->pa_iot;
@@ -564,10 +564,10 @@
                    sc->sc_wdcdev.sc_dev.dv_xname, cp->name);
                bus_space_unmap(wdc_cp->cmd_iot, wdc_cp->cmd_ioh,
                    PCIIDE_COMPAT_CMD_SIZE);
-               rv = 0;
+               return (0);
        }
 
-       return (rv);
+       return (1);
 }
 
 int



Home | Main Index | Thread Index | Old Index