diff --git a/src/acpi/soundwire.c b/src/acpi/soundwire.c
index af4ca7cf15..961f45b5b2 100644
--- a/src/acpi/soundwire.c
+++ b/src/acpi/soundwire.c
@@ -400,7 +400,7 @@ void soundwire_gen_codec(struct acpi_dp *dsd, const struct soundwire_codec *code
 		struct acpi_dp *dpn;
 
 		/* Stop processing at the first invalid data port. */
-		if (entry->port < SOUNDWIRE_MIN_DPN || entry->port > SOUNDWIRE_MAX_DPN)
+		if (entry->port < SOUNDWIRE_MIN_DPN || entry->port >= SOUNDWIRE_MAX_DPN)
 			break;
 
 		if (entry->source) {
diff --git a/src/include/device/soundwire.h b/src/include/device/soundwire.h
index a78b52b719..27421dd5a2 100644
--- a/src/include/device/soundwire.h
+++ b/src/include/device/soundwire.h
@@ -419,7 +419,7 @@ struct soundwire_dpn_entry {
 struct soundwire_codec {
 	struct soundwire_slave *slave;
 	struct soundwire_audio_mode *audio_mode[SOUNDWIRE_MAX_MODE];
-	struct soundwire_dpn_entry dpn[SOUNDWIRE_MAX_DPN - SOUNDWIRE_MIN_DPN];
+	struct soundwire_dpn_entry dpn[SOUNDWIRE_MAX_DPN];
 	struct soundwire_bra_mode *dp0_bra_mode[SOUNDWIRE_MAX_MODE];
 	struct soundwire_dp0 *dp0;
 	struct soundwire_multilane *multilane;