diff --git a/sys/dev/atkbdc/psm.c b/sys/dev/atkbdc/psm.c
index daa3744d812b..3361bddccf76 100644
--- a/sys/dev/atkbdc/psm.c
+++ b/sys/dev/atkbdc/psm.c
@@ -896,12 +896,12 @@ psmidentify(driver_t *driver, device_t parent)
     bus_set_resource(psm, SYS_RES_IRQ, KBDC_RID_AUX, irq, 1);
 }
 
-#define endprobe(v)	{   if (bootverbose) 				\
+#define endprobe(v)	do {   if (bootverbose)				\
 				--verbose;   				\
                             kbdc_set_device_mask(sc->kbdc, mask);	\
 			    kbdc_lock(sc->kbdc, FALSE);			\
 			    return (v);	     				\
-			}
+			} while (0)
 
 static int
 psmprobe(device_t dev)
diff --git a/sys/isa/psm.c b/sys/isa/psm.c
index daa3744d812b..3361bddccf76 100644
--- a/sys/isa/psm.c
+++ b/sys/isa/psm.c
@@ -896,12 +896,12 @@ psmidentify(driver_t *driver, device_t parent)
     bus_set_resource(psm, SYS_RES_IRQ, KBDC_RID_AUX, irq, 1);
 }
 
-#define endprobe(v)	{   if (bootverbose) 				\
+#define endprobe(v)	do {   if (bootverbose)				\
 				--verbose;   				\
                             kbdc_set_device_mask(sc->kbdc, mask);	\
 			    kbdc_lock(sc->kbdc, FALSE);			\
 			    return (v);	     				\
-			}
+			} while (0)
 
 static int
 psmprobe(device_t dev)