All of lore.kernel.org
 help / color / mirror / Atom feed
From: linux@audioscience.com
To: patch@alsa-project.org
Cc: Eliot Blennerhassett <eblennerhassett@audioscience.com>,
	alsa-devel@alsa-project.org
Subject: [PATCH] Allow mux to have up to 256 sources. Log warning and return index 0 rather than error if DSP returns invalid value. (amixer fails if error returned on get)
Date: Fri, 05 Feb 2010 12:50:40 +1300	[thread overview]
Message-ID: <1265327440-6672-1-git-send-email-linux@audioscience.com> (raw)

From: Eliot Blennerhassett <eblennerhassett@audioscience.com>

Signed-off-by: Eliot Blennerhassett <eblennerhassett@audioscience.com>
---
 pci/asihpi/asihpi.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pci/asihpi/asihpi.c b/pci/asihpi/asihpi.c
index 0c7b4fb..4f82e9f 100644
--- a/pci/asihpi/asihpi.c
+++ b/pci/asihpi/asihpi.c
@@ -2187,7 +2187,7 @@ static int snd_asihpi_mux_get(struct snd_kcontrol *kcontrol,
 	HPI_HandleError(HPI_Multiplexer_GetSource(phSubSys, hControl,
 				&wSourceType, &wSourceIndex));
 	/* Should cache this search result! */
-	for (s = 0; s < 16; s++) {
+	for (s = 0; s < 256; s++) {
 		if (HPI_Multiplexer_QuerySource(phSubSys, hControl, s,
 					    &wSrcNodeType, &wSrcNodeIndex))
 			break;
@@ -2198,7 +2198,10 @@ static int snd_asihpi_mux_get(struct snd_kcontrol *kcontrol,
 			return 0;
 		}
 	}
-	return -EINVAL;
+	snd_printd(KERN_WARNING "Control %x failed to match mux source %hu %hu\n",
+			hControl, wSourceType, wSourceIndex);
+	ucontrol->value.enumerated.item[0] = 0;
+	return 0;
 }
 
 static int snd_asihpi_mux_put(struct snd_kcontrol *kcontrol,
-- 
1.7.0.rc0.8.ge3f67d

             reply	other threads:[~2010-02-04 23:50 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-02-04 23:50 linux [this message]
2010-02-05  7:52 ` [PATCH] Allow mux to have up to 256 sources. Log warning and return index 0 rather than error if DSP returns invalid value. (amixer fails if error returned on get) Takashi Iwai

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1265327440-6672-1-git-send-email-linux@audioscience.com \
    --to=linux@audioscience.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=eblennerhassett@audioscience.com \
    --cc=patch@alsa-project.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.