All of lore.kernel.org
 help / color / mirror / Atom feed
From: Daniel Mack <zonque@gmail.com>
To: alsa-devel@alsa-project.org
Cc: stable@kernel.org, Daniel Mack <zonque@gmail.com>
Subject: [PATCH 4/5] ALSA: snd-usb: ignore mixer units of type UAC2_EXTENSION_UNIT_V2
Date: Wed, 13 Jul 2011 02:13:28 +0200	[thread overview]
Message-ID: <1310516009-4387-4-git-send-email-zonque@gmail.com> (raw)
In-Reply-To: <1310516009-4387-1-git-send-email-zonque@gmail.com>

Failing with a hard error is unjustified. Simply ignore them for now
so the rest of the device can be used.

Signed-off-by: Daniel Mack <zonque@gmail.com>
Reported-by: Nicolai Krakowiak <nicolai.krakowiak@gmail.com>
Cc: stable@kernel.org
---
 sound/usb/mixer.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c
index c43dbea..7f7dde8 100644
--- a/sound/usb/mixer.c
+++ b/sound/usb/mixer.c
@@ -1899,6 +1899,9 @@ static int parse_audio_unit(struct mixer_build *state, int unitid)
 			return parse_audio_extension_unit(state, unitid, p1);
 		else /* UAC_VERSION_2 */
 			return parse_audio_processing_unit(state, unitid, p1);
+	case UAC2_EXTENSION_UNIT_V2:
+		snd_printdd(KERN_WARNING "Ignoring UAC2_EXTENSION_UNIT\n");
+		return 0; /* FIXME - extension units are not implemented yet */
 	default:
 		snd_printk(KERN_ERR "usbaudio: unit %u: unexpected type 0x%02x\n", unitid, p1[2]);
 		return -EINVAL;
-- 
1.7.5.4

_______________________________________________
stable mailing list
stable@linux.kernel.org
http://linux.kernel.org/mailman/listinfo/stable

  parent reply	other threads:[~2011-07-13  0:13 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-07-13  0:13 [PATCH 1/5] ALSA: snd-usb: don't fail hard if mixer creation fails Daniel Mack
2011-07-13  0:13 ` [PATCH 2/5] ALSA: snd-usb: use snd_printk() instead of printk() Daniel Mack
2011-07-13  5:31   ` Takashi Iwai
2011-07-13  0:13 ` [PATCH 3/5] ALSA: snd-usb: be more verbose about bogus UAC_FORMAT_TYPE descriptors Daniel Mack
2011-07-13  0:13 ` Daniel Mack [this message]
2011-07-13  0:13 ` [PATCH 5/5] ALSA: snd-usb: Accept UAC2 FORMAT_TYPE descriptors with bLength > 6 Daniel Mack
2011-07-13  5:29 ` [PATCH 1/5] ALSA: snd-usb: don't fail hard if mixer creation fails Takashi Iwai
2011-07-13 12:06   ` Daniel Mack

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=1310516009-4387-4-git-send-email-zonque@gmail.com \
    --to=zonque@gmail.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=stable@kernel.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.