Commit 596580d0 authored by Daniel Mack's avatar Daniel Mack Committed by Takashi Iwai
Browse files

ALSA: snd-usb: add snd_usb_audio-wide mutex 



This is needed for new card-wide list operations.

Signed-off-by: default avatarDaniel Mack <zonque@gmail.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent dd775ae2

sound/usb/card.c

+2 −0
Original line number Diff line number Diff line
@@ -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;

sound/usb/usbaudio.h

+1 −0
Original line number Diff line number Diff line
@@ -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;