diff --git a/arch/arm/mach-pxa/mfp-pxa2xx.c b/arch/arm/mach-pxa/mfp-pxa2xx.c
index b0a8428..adf23f5 100644
--- a/arch/arm/mach-pxa/mfp-pxa2xx.c
+++ b/arch/arm/mach-pxa/mfp-pxa2xx.c
@@ -374,6 +374,14 @@ static int pxa2xx_mfp_suspend(void)
 
 		GPDR(i * 32) = gpdr_lpm[i];
 	}
+
+	/* set corresponding GPDR bit of those marked MFP_LPM_KEEP_OUTPUT */
+	for (i = 0; i < pxa_last_gpio; i++) {
+		if ((gpio_desc[i].config & MFP_LPM_KEEP_OUTPUT) &&
+		    (saved_gpdr[gpio_to_bank(i)] & GPIO_bit(i)))
+			GPDR(i) |= GPIO_bit(i);
+	}
+
 	return 0;
 }