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/5] ALSA: snd-usb: add snd_usb_audio-wide mutex
Date: Wed, 21 Dec 2011 00:34:44 +0100	[thread overview]
Message-ID: <1324424088-5705-2-git-send-email-zonque@gmail.com> (raw)
In-Reply-To: <1324424088-5705-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 0f6dc0d..ccfe1c6 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.5.4

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

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-12-20 23:34 [PATCH 0/5] snd-usb endpoint rework, take 5 Daniel Mack
2011-12-20 23:34 ` Daniel Mack [this message]
2011-12-20 23:34 ` [PATCH 2/5] ALSA: snd-usb: implement new endpoint streaming model Daniel Mack
2011-12-21 16:16   ` Aurélien Leblond
2011-12-21 16:34     ` Daniel Mack
2011-12-21 17:11       ` Aurélien Leblond
2011-12-21 17:18         ` Daniel Mack
2011-12-22 17:55           ` Aurélien Leblond
2011-12-22 19:04             ` Daniel Mack
2011-12-20 23:34 ` [PATCH 3/5] ALSA: snd-usb: switch over to new endpoint streaming logic Daniel Mack
2011-12-20 23:34 ` [PATCH 4/5] ALSA: snd-usb: remove old " Daniel Mack
2011-12-20 23:34 ` [PATCH 5/5] ALSA: snd-usb: add support for implicit feedback Daniel Mack
  -- strict thread matches above, loose matches on Subject: below --
2011-12-20  9:48 [PATCH 0/5] snd-usb endpoint rework, take 4 Daniel Mack
2011-12-20  9:48 ` [PATCH 1/5] ALSA: snd-usb: add snd_usb_audio-wide mutex Daniel Mack
2011-12-18 23:02 [PATCH 0/5] snd-usb endpoint logic rework, version 3 Daniel Mack
2011-12-18 23:02 ` [PATCH 1/5] ALSA: snd-usb: add snd_usb_audio-wide mutex Daniel Mack
2011-11-18 20:05 [PATCH 0/5] RFC v2 for snd-usb endpoint logic rework Daniel Mack
2011-11-18 20:05 ` [PATCH 1/5] 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=1324424088-5705-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).