Commit d6f1c1c3 authored by Eliot Blennerhassett's avatar Eliot Blennerhassett Committed by Takashi Iwai
Browse files

ALSA: asihpi - Allow adapters with duplicate index jumpers to be discovered. 



Signed-off-by: default avatarEliot Blennerhassett <eblennerhassett@audioscience.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent fc3a3990

sound/pci/asihpi/hpicmn.c

+12 −2
Original line number Diff line number Diff line
@@ -78,8 +78,18 @@ u16 hpi_add_adapter(struct hpi_adapter_obj *pao) 
	}



	if (adapters.adapter[pao->index].adapter_type) {

		{

			retval = HPI_DUPLICATE_ADAPTER_NUMBER;

		int a;

		for (a = HPI_MAX_ADAPTERS - 1; a >= 0; a--) {

			if (!adapters.adapter[a].adapter_type) {

				HPI_DEBUG_LOG(WARNING,

					"ASI%X duplicate index %d moved to %d\n",

					pao->adapter_type, pao->index, a);

				pao->index = a;

				break;

			}

		}

		if (a < 0) {

			retval = HPI_ERROR_DUPLICATE_ADAPTER_NUMBER;

			goto unlock;

		}

	}