alsa-devel.alsa-project.org archive mirror
 help / color / mirror / Atom feed
From: Daniel Mack <zonque@gmail.com>
To: alsa-devel@alsa-project.org
Cc: gdiffey@gmail.com, tiwai@suse.de, clemens@ladisch.de,
	linuxaudio@showlabor.de, Daniel Mack <zonque@gmail.com>,
	blablack@gmail.com
Subject: [PATCH 1/6] ALSA: snd-usb: add snd_usb_audio-wide mutex
Date: Fri, 23 Dec 2011 17:15:42 +0100	[thread overview]
Message-ID: <1324656947-23169-2-git-send-email-zonque@gmail.com> (raw)
In-Reply-To: <1324656947-23169-1-git-send-email-zonque@gmail.com>

This is needed for new card-wide list operations.

Signed-off-by: Daniel Mack <zonque@gmail.com>
---
 sound/usb/card.c     |    2 ++
 sound/usb/usbaudio.h |    1 +
 2 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/sound/usb/card.c b/sound/usb/card.c
index 4a7be7b..6bc88b7 100644
--- a/sound/usb/card.c
+++ b/sound/usb/card.c
@@ -276,6 +276,7 @@ static int snd_usb_create_streams(struct snd_usb_audio *chip, int ctrlif)
 
 static int snd_usb_audio_free(struct snd_usb_audio *chip)
 {
+	mutex_destroy(&chip->mutex);
 	kfree(chip);
 	return 0;
 }
@@ -336,6 +337,7 @@ static int snd_usb_audio_create(struct usb_device *dev, int idx,
 		return -ENOMEM;
 	}
 
+	mutex_init(&chip->mutex);
 	mutex_init(&chip->shutdown_mutex);
 	chip->index = idx;
 	chip->dev = dev;
diff --git a/sound/usb/usbaudio.h b/sound/usb/usbaudio.h
index 3e2b035..a16c21d 100644
--- a/sound/usb/usbaudio.h
+++ b/sound/usb/usbaudio.h
@@ -36,6 +36,7 @@ struct snd_usb_audio {
 	struct snd_card *card;
 	struct usb_interface *pm_intf;
 	u32 usb_id;
+	struct mutex mutex;
 	struct mutex shutdown_mutex;
 	unsigned int shutdown:1;
 	unsigned int probing:1;
-- 
1.7.7.4

  reply	other threads:[~2011-12-23 16:16 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-12-23 16:15 [PATCH 0/6] snd-usb endpoint rework, version 6 Daniel Mack
2011-12-23 16:15 ` Daniel Mack [this message]
2011-12-23 16:15 ` [PATCH 2/6] ALSA: snd-usb: implement new endpoint streaming model Daniel Mack
2011-12-23 16:15 ` [PATCH 3/6] ALSA: snd-usb: switch over to new endpoint streaming logic Daniel Mack
2011-12-23 16:15 ` [PATCH 4/6] ALSA: snd-usb: remove old " Daniel Mack
2011-12-23 16:15 ` [PATCH 5/6] ALSA: snd-usb: add support for implicit feedback Daniel Mack
2011-12-23 16:15 ` [PATCH 6/6] ALSA: snd-usb: add some documentation Daniel Mack
2011-12-30 13:56 ` [PATCH 0/6] snd-usb endpoint rework, version 6 Daniel Mack
2011-12-30 15:22   ` Felix Homann
     [not found]   ` <CAFz=ag6XNJSXvYQnAEbx=M+zXVH7sEw=_CJQKx63MmdQBWFuwA@mail.gmail.com>
2011-12-30 15:24     ` Daniel Mack
     [not found]       ` <CACckToWP-C5H2xhvdJ5ykNf4BcuNCa4cMyFh2hppcwW0u33fQQ@mail.gmail.com>
     [not found]         ` <4EFE6E52.4050503@gmail.com>
2011-12-31  4:35           ` Grant Diffey
2011-12-31  8:04             ` Grant Diffey
2011-12-31 14:23   ` Felix Homann
2011-12-31 15:02     ` Aurélien Leblond
2011-12-31 15:39       ` Felix Homann
     [not found]   ` <CAFz=ag7_qzPJq44havp=EbFVKud5VvKaOLJk0i0dM43X3urp9Q@mail.gmail.com>
2012-01-01 17:09     ` Felix Homann
2012-01-16 20:26       ` Grant Diffey
2012-01-16 20:27         ` Grant Diffey
2012-04-09 19:21         ` Daniel Mack
2012-04-10 15:35           ` Grant Diffey
2012-04-10 18:52           ` Felix Homann
2012-04-11 15:08             ` Daniel Mack
2012-04-12  9:05               ` Felix Homann
2012-04-12 11:45                 ` Daniel Mack
2012-04-10 15:40       ` Grant Diffey
  -- strict thread matches above, loose matches on Subject: below --
2012-04-12 11:51 [PATCH 0/6] snd-usb endpoint rework, version 7 Daniel Mack
2012-04-12 11:51 ` [PATCH 1/6] ALSA: snd-usb: add snd_usb_audio-wide mutex 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=1324656947-23169-2-git-send-email-zonque@gmail.com \
    --to=zonque@gmail.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=blablack@gmail.com \
    --cc=clemens@ladisch.de \
    --cc=gdiffey@gmail.com \
    --cc=linuxaudio@showlabor.de \
    --cc=tiwai@suse.de \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).