[src/trunk]: src/sys/dev/pcmcia No need to disable if we failed before enabli...

[enami <enami%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6b6e3ef39578
branches:  trunk
changeset: 569809:6b6e3ef39578
user:      enami <enami%NetBSD.org@localhost>
date:      Tue Sep 07 00:24:18 2004 +0000

description:
No need to disable if we failed before enabling it.

diffstat:

 sys/dev/pcmcia/wdc_pcmcia.c |  8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diffs (36 lines):

diff -r 4d0cfae818b9 -r 6b6e3ef39578 sys/dev/pcmcia/wdc_pcmcia.c
--- a/sys/dev/pcmcia/wdc_pcmcia.c       Mon Sep 06 23:41:21 2004 +0000
+++ b/sys/dev/pcmcia/wdc_pcmcia.c       Tue Sep 07 00:24:18 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: wdc_pcmcia.c,v 1.95 2004/08/20 06:39:39 thorpej Exp $ */
+/*     $NetBSD: wdc_pcmcia.c,v 1.96 2004/09/07 00:24:18 enami Exp $ */
 
 /*-
  * Copyright (c) 1998, 2003, 2004 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc_pcmcia.c,v 1.95 2004/08/20 06:39:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc_pcmcia.c,v 1.96 2004/09/07 00:24:18 enami Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -247,7 +247,7 @@
                    &wdr->cmd_iohs[i]) != 0) {
                        aprint_error("%s: can't subregion I/O space\n",
                            self->dv_xname);
-                       goto fail2;
+                       goto fail;
                }
        }
 
@@ -291,8 +291,6 @@
        sc->sc_state = WDC_PCMCIA_ATTACHED;
        return;
 
-fail2:
-       wdc_pcmcia_enable(self, 0);
 fail:
        pcmcia_function_unconfigure(pa->pf);
 }