[src/trunk]: src/sys/dev/pcmcia Revert previous and fix correctly. Thanks, j...

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

details:   https://anonhg.NetBSD.org/src/rev/bc647e6856fa
branches:  trunk
changeset: 795635:bc647e6856fa
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Mon Apr 21 22:40:00 2014 +0000

description:
Revert previous and fix correctly.  Thanks, joerg

diffstat:

 sys/dev/pcmcia/if_malo_pcmcia.c |  9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diffs (39 lines):

diff -r 103e13945985 -r bc647e6856fa sys/dev/pcmcia/if_malo_pcmcia.c
--- a/sys/dev/pcmcia/if_malo_pcmcia.c   Mon Apr 21 21:57:03 2014 +0000
+++ b/sys/dev/pcmcia/if_malo_pcmcia.c   Mon Apr 21 22:40:00 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_malo_pcmcia.c,v 1.5 2014/04/21 20:24:21 pgoyette Exp $      */
+/*     $NetBSD: if_malo_pcmcia.c,v 1.6 2014/04/21 22:40:00 pgoyette Exp $      */
 /*      $OpenBSD: if_malo.c,v 1.65 2009/03/29 21:53:53 sthen Exp $ */
 
 /*
@@ -18,7 +18,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_malo_pcmcia.c,v 1.5 2014/04/21 20:24:21 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_malo_pcmcia.c,v 1.6 2014/04/21 22:40:00 pgoyette Exp $");
 
 #ifdef _MODULE
 #include <sys/module.h>
@@ -66,7 +66,7 @@
 int cmalo_d = 1;
 #define DPRINTF(l, x...)       do { if ((l) <= cmalo_d) printf(x); } while (0)
 #else
-#define DPRINTF(l, x...)
+#define DPRINTF(l, x...)       do {} while (0)
 #endif
 
 static int     malo_pcmcia_match(device_t, cfdata_t, void *);
@@ -1859,10 +1859,9 @@
                DPRINTF(1, "%s: association failed (status %d)\n",
                    device_xname(sc->sc_dev), body->status);
                sc->sc_flags |= MALO_ASSOC_FAILED;
-       } else {
+       } else
                DPRINTF(1, "%s: association successful\n",
                    device_xname(sc->sc_dev));
-       }
 
        return 0;
 }