diff --git a/include/libopencm3/stm32/f1/adc.h b/include/libopencm3/stm32/f1/adc.h
index fc7be3f5..4858734d 100644
--- a/include/libopencm3/stm32/f1/adc.h
+++ b/include/libopencm3/stm32/f1/adc.h
@@ -615,13 +615,16 @@ injected channels.
 #define ADC_JSQR_JL_3CHANNELS       (0x2 << ADC_JSQR_JL_LSB)
 #define ADC_JSQR_JL_4CHANNELS       (0x3 << ADC_JSQR_JL_LSB)
 /**@}*/
-#define ADC_JSQR_JL_SHIFT		13
+#define ADC_JSQR_JL_SHIFT		20
 #define ADC_JSQR_JL_MSK			(0x2 << ADC_JSQR_JL_LSB)
 #define ADC_JSQR_JSQ4_MSK		(0x1f << ADC_JSQR_JSQ4_LSB)
 #define ADC_JSQR_JSQ3_MSK		(0x1f << ADC_JSQR_JSQ3_LSB)
 #define ADC_JSQR_JSQ2_MSK		(0x1f << ADC_JSQR_JSQ2_LSB)
 #define ADC_JSQR_JSQ1_MSK		(0x1f << ADC_JSQR_JSQ1_LSB)
 
+#define ADC_JSQR_JSQ_VAL(n,val)		((val) << (((n) - 1) * 5))
+#define ADC_JSQR_JL_VAL(val)		(((val) - 1) << ADC_JSQR_JL_SHIFT)
+
 /* --- ADC_JDRx, ADC_DR values --------------------------------------------- */
 
 #define ADC_JDATA_LSB			0
diff --git a/include/libopencm3/stm32/f3/adc.h b/include/libopencm3/stm32/f3/adc.h
index cee45519..6ead9176 100644
--- a/include/libopencm3/stm32/f3/adc.h
+++ b/include/libopencm3/stm32/f3/adc.h
@@ -622,11 +622,15 @@
 /*------- ADC_JSQR values ---------*/
 
 #define ADC_JSQR_JL_LSB			0
+#define ADC_JSQR_JL_SHIFT		0
 #define ADC_JSQR_JSQ4_LSB		26
 #define ADC_JSQR_JSQ3_LSB		20
 #define ADC_JSQR_JSQ2_LSB		14
 #define ADC_JSQR_JSQ1_LSB		8
 
+#define ADC_JSQR_JSQ_VAL(n,val)		((val) << (((n) - 1) * 6 + 8))
+#define ADC_JSQR_JL_VAL(val)		(((val) - 1) << ADC_JSQR_JL_SHIFT)
+
 /* Bits 30:26 JSQ4[4:0]: 4th conversion in the injected sequence */
 
 /* Bits 24:20 JSQ3[4:0]: 3rd conversion in the injected sequence */
diff --git a/include/libopencm3/stm32/f4/adc.h b/include/libopencm3/stm32/f4/adc.h
index 968e2d88..23a8d753 100644
--- a/include/libopencm3/stm32/f4/adc.h
+++ b/include/libopencm3/stm32/f4/adc.h
@@ -580,13 +580,16 @@ injected channels.
 #define ADC_JSQR_JL_3CHANNELS       (0x2 << ADC_JSQR_JL_LSB)
 #define ADC_JSQR_JL_4CHANNELS       (0x3 << ADC_JSQR_JL_LSB)
 /**@}*/
-#define ADC_JSQR_JL_SHIFT		13
+#define ADC_JSQR_JL_SHIFT		20
 #define ADC_JSQR_JL_MSK			(0x2 << ADC_JSQR_JL_LSB)
 #define ADC_JSQR_JSQ4_MSK		(0x1f << ADC_JSQR_JSQ4_LSB)
 #define ADC_JSQR_JSQ3_MSK		(0x1f << ADC_JSQR_JSQ3_LSB)
 #define ADC_JSQR_JSQ2_MSK		(0x1f << ADC_JSQR_JSQ2_LSB)
 #define ADC_JSQR_JSQ1_MSK		(0x1f << ADC_JSQR_JSQ1_LSB)
 
+#define ADC_JSQR_JSQ_VAL(n,val)		((val) << (((n) - 1) * 5))
+#define ADC_JSQR_JL_VAL(val)		(((val) - 1) << ADC_JSQR_JL_SHIFT)
+
 /* --- ADC_JDRx, ADC_DR values --------------------------------------------- */
 
 #define ADC_JDATA_LSB			0
diff --git a/lib/stm32/f1/adc.c b/lib/stm32/f1/adc.c
index 21f1cb3d..459b8abf 100644
--- a/lib/stm32/f1/adc.c
+++ b/lib/stm32/f1/adc.c
@@ -1091,16 +1091,16 @@ void adc_set_injected_sequence(uint32_t adc, uint8_t length, uint8_t channel[])
 	uint32_t reg32 = 0;
 	uint8_t i = 0;
 
-	/* Maximum sequence length is 4 channels. */
-	if (length > 4) {
+	/* Maximum sequence length is 4 channels. Minimum sequence is 1.*/
+	if ((length - 1) > 3) {
 		return;
 	}
 
 	for (i = 1; i <= length; i++) {
-		reg32 |= (channel[4 - i] << ((4 - i) * 5));
+		reg32 |= ADC_JSQR_JSQ_VAL(4 - i, channel[length - i - 1]);
 	}
 
-	reg32 |= ((length - 1) << ADC_JSQR_JL_LSB);
+	reg32 |= ADC_JSQR_JL_VAL(length);
 
 	ADC_JSQR(adc) = reg32;
 }
diff --git a/lib/stm32/f3/adc.c b/lib/stm32/f3/adc.c
index d0cc7c6d..6d34ee21 100644
--- a/lib/stm32/f3/adc.c
+++ b/lib/stm32/f3/adc.c
@@ -697,16 +697,16 @@ void adc_set_injected_sequence(uint32_t adc, uint8_t length, uint8_t channel[])
 	uint32_t reg32 = 0;
 	uint8_t i = 0;
 
-	/* Maximum sequence length is 4 channels. */
-	if ((length-1) > 3) {
+	/* Maximum sequence length is 4 channels. Minimum sequence is 1.*/
+	if ((length - 1) > 3) {
 		return;
 	}
 
 	for (i = 1; i <= length; i++) {
-		reg32 |= (channel[4 - i] << ((4 - i) * 5));
+		reg32 |= ADC_JSQR_JSQ_VAL(4 - i, channel[length - i - 1]);
 	}
 
-	reg32 |= ((length - 1) << ADC_JSQR_JL_LSB);
+	reg32 |= ADC_JSQR_JL_VAL(length);
 
 	ADC_JSQR(adc) = reg32;
 }
diff --git a/lib/stm32/f4/adc.c b/lib/stm32/f4/adc.c
index 99ba5b23..95cc4ae0 100644
--- a/lib/stm32/f4/adc.c
+++ b/lib/stm32/f4/adc.c
@@ -634,16 +634,16 @@ void adc_set_injected_sequence(uint32_t adc, uint8_t length, uint8_t channel[])
 	uint32_t reg32 = 0;
 	uint8_t i = 0;
 
-	/* Maximum sequence length is 4 channels. */
-	if ((length-1) > 3) {
+	/* Maximum sequence length is 4 channels. Minimum sequence is 1.*/
+	if ((length - 1) > 3) {
 		return;
 	}
 
-	for (i = 1; i <= length; i++) {
-		reg32 |= (channel[4 - i] << ((4 - i) * 5));
+	for (i = 0; i < length; i++) {
+		reg32 |= ADC_JSQR_JSQ_VAL(4 - i, channel[length - i - 1]);
 	}
 
-	reg32 |= ((length - 1) << ADC_JSQR_JL_LSB);
+	reg32 |= ADC_JSQR_JL_VAL(length);
 
 	ADC_JSQR(adc) = reg32;
 }