From 5b03462b1b78e175bd946e9a13bf9692b389deac Mon Sep 17 00:00:00 2001
From: pgoyette <pgoyette@NetBSD.org>
Date: Mon, 21 Apr 2014 22:40:00 +0000
Subject: [PATCH] Revert previous and fix correctly.  Thanks, joerg

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

diff --git a/sys/dev/pcmcia/if_malo_pcmcia.c b/sys/dev/pcmcia/if_malo_pcmcia.c
index 129d9151f75d..288525be5863 100644
--- a/sys/dev/pcmcia/if_malo_pcmcia.c
+++ b/sys/dev/pcmcia/if_malo_pcmcia.c
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: if_malo_pcmcia.c,v 1.5 2014/04/21 20:24:21 pgoyette
 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 @@ cmalo_cmd_rsp_assoc(struct malo_softc *sc)
 		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;
 }