diff --git a/firmware/sgpio/sgpio.c b/firmware/sgpio/sgpio.c
index f3616f5d..47de564d 100644
--- a/firmware/sgpio/sgpio.c
+++ b/firmware/sgpio/sgpio.c
@@ -68,10 +68,10 @@ void release_cpld_jtag_pins() {
 	scu_pinmux(SCU_PINMUX_CPLD_TMS, SCU_GPIO_NOPULL | SCU_CONF_FUNCTION0);
 	scu_pinmux(SCU_PINMUX_CPLD_TDI, SCU_GPIO_NOPULL | SCU_CONF_FUNCTION0);
 
-	GPIO_CLR(PORT_CPLD_TDO) = PIN_CPLD_TDO;
-	GPIO_CLR(PORT_CPLD_TCK) = PIN_CPLD_TCK;
-	GPIO_CLR(PORT_CPLD_TMS) = PIN_CPLD_TMS;
-	GPIO_CLR(PORT_CPLD_TDI) = PIN_CPLD_TDI;
+	GPIO_DIR(PORT_CPLD_TDO) &= ~PIN_CPLD_TDO;
+	GPIO_DIR(PORT_CPLD_TCK) &= ~PIN_CPLD_TCK;
+	GPIO_DIR(PORT_CPLD_TMS) &= ~PIN_CPLD_TMS;
+	GPIO_DIR(PORT_CPLD_TDI) &= ~PIN_CPLD_TDI;
 }
 
 void configure_sgpio_pin_functions() {