Module Name: src
Committed By: pgoyette
Date: Mon Apr 21 22:40:00 UTC 2014
Modified Files:
src/sys/dev/pcmcia: if_malo_pcmcia.c
Log Message:
Revert previous and fix correctly. Thanks, joerg
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/pcmcia/if_malo_pcmcia.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pcmcia/if_malo_pcmcia.c
diff -u src/sys/dev/pcmcia/if_malo_pcmcia.c:1.5 src/sys/dev/pcmcia/if_malo_pcmcia.c:1.6
--- src/sys/dev/pcmcia/if_malo_pcmcia.c:1.5 Mon Apr 21 20:24:21 2014
+++ src/sys/dev/pcmcia/if_malo_pcmcia.c Mon Apr 21 22:40:00 2014
@@ -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_pcmc
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 *s
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;
}
