Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 28503
b: refs/heads/master
c: 746df94
h: refs/heads/master
i:
  28501: 6f00a8c
  28499: ced0a58
  28495: 3cae03d
v: v3
  • Loading branch information
Takashi Iwai authored and Jaroslav Kysela committed Jun 22, 2006
1 parent 27454f7 commit 7961735
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 29 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0defb2672d7cde8d048eec35c183da7b88adbd9e
refs/heads/master: 746df94898554b3d8e91d855e934852e626c701c
3 changes: 1 addition & 2 deletions trunk/include/sound/core.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,9 +233,8 @@ int copy_from_user_toio(volatile void __iomem *dst, const void __user *src, size

/* init.c */

extern unsigned int snd_cards_lock;
extern struct snd_card *snd_cards[SNDRV_CARDS];
extern rwlock_t snd_card_rwlock;
int snd_card_locked(int card);
#if defined(CONFIG_SND_MIXER_OSS) || defined(CONFIG_SND_MIXER_OSS_MODULE)
#define SND_MIXER_OSS_NOTIFY_REGISTER 0
#define SND_MIXER_OSS_NOTIFY_DISCONNECT 1
Expand Down
51 changes: 31 additions & 20 deletions trunk/sound/core/init.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ struct snd_shutdown_f_ops {
struct snd_shutdown_f_ops *next;
};

unsigned int snd_cards_lock = 0; /* locked for registering/using */
static unsigned int snd_cards_lock = 0; /* locked for registering/using */
struct snd_card *snd_cards[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)] = NULL};
EXPORT_SYMBOL(snd_cards);

DEFINE_RWLOCK(snd_card_rwlock);
static DEFINE_MUTEX(snd_card_mutex);

#if defined(CONFIG_SND_MIXER_OSS) || defined(CONFIG_SND_MIXER_OSS_MODULE)
int (*snd_mixer_oss_notify_callback)(struct snd_card *card, int free_flag);
Expand Down Expand Up @@ -112,7 +112,7 @@ struct snd_card *snd_card_new(int idx, const char *xid,
strlcpy(card->id, xid, sizeof(card->id));
}
err = 0;
write_lock(&snd_card_rwlock);
mutex_lock(&snd_card_mutex);
if (idx < 0) {
int idx2;
for (idx2 = 0; idx2 < SNDRV_CARDS; idx2++)
Expand All @@ -130,12 +130,12 @@ struct snd_card *snd_card_new(int idx, const char *xid,
else
err = -ENODEV;
if (idx < 0 || err < 0) {
write_unlock(&snd_card_rwlock);
mutex_unlock(&snd_card_mutex);
snd_printk(KERN_ERR "cannot find the slot for index %d (range 0-%i)\n", idx, snd_ecards_limit - 1);
goto __error;
}
snd_cards_lock |= 1 << idx; /* lock it */
write_unlock(&snd_card_rwlock);
mutex_unlock(&snd_card_mutex);
card->number = idx;
card->module = module;
INIT_LIST_HEAD(&card->devices);
Expand Down Expand Up @@ -173,6 +173,17 @@ struct snd_card *snd_card_new(int idx, const char *xid,

EXPORT_SYMBOL(snd_card_new);

/* return non-zero if a card is already locked */
int snd_card_locked(int card)
{
int locked;

mutex_lock(&snd_card_mutex);
locked = snd_cards_lock & (1 << card);
mutex_unlock(&snd_card_mutex);
return locked;
}

static loff_t snd_disconnect_llseek(struct file *file, loff_t offset, int orig)
{
return -ENODEV;
Expand Down Expand Up @@ -240,9 +251,9 @@ int snd_card_disconnect(struct snd_card *card)
spin_unlock(&card->files_lock);

/* phase 1: disable fops (user space) operations for ALSA API */
write_lock(&snd_card_rwlock);
mutex_lock(&snd_card_mutex);
snd_cards[card->number] = NULL;
write_unlock(&snd_card_rwlock);
mutex_unlock(&snd_card_mutex);

/* phase 2: replace file->f_op with special dummy operations */

Expand Down Expand Up @@ -321,9 +332,9 @@ int snd_card_free(struct snd_card *card)

if (card == NULL)
return -EINVAL;
write_lock(&snd_card_rwlock);
mutex_lock(&snd_card_mutex);
snd_cards[card->number] = NULL;
write_unlock(&snd_card_rwlock);
mutex_unlock(&snd_card_mutex);

#ifdef CONFIG_PM
wake_up(&card->power_sleep);
Expand Down Expand Up @@ -359,9 +370,9 @@ int snd_card_free(struct snd_card *card)
card->s_f_ops = s_f_ops->next;
kfree(s_f_ops);
}
write_lock(&snd_card_rwlock);
mutex_lock(&snd_card_mutex);
snd_cards_lock &= ~(1 << card->number);
write_unlock(&snd_card_rwlock);
mutex_unlock(&snd_card_mutex);
kfree(card);
return 0;
}
Expand Down Expand Up @@ -497,16 +508,16 @@ int snd_card_register(struct snd_card *card)
snd_assert(card != NULL, return -EINVAL);
if ((err = snd_device_register_all(card)) < 0)
return err;
write_lock(&snd_card_rwlock);
mutex_lock(&snd_card_mutex);
if (snd_cards[card->number]) {
/* already registered */
write_unlock(&snd_card_rwlock);
mutex_unlock(&snd_card_mutex);
return 0;
}
if (card->id[0] == '\0')
choose_default_id(card);
snd_cards[card->number] = card;
write_unlock(&snd_card_rwlock);
mutex_unlock(&snd_card_mutex);
init_info_for_card(card);
#if defined(CONFIG_SND_MIXER_OSS) || defined(CONFIG_SND_MIXER_OSS_MODULE)
if (snd_mixer_oss_notify_callback)
Expand All @@ -527,7 +538,7 @@ static void snd_card_info_read(struct snd_info_entry *entry,
struct snd_card *card;

for (idx = count = 0; idx < SNDRV_CARDS; idx++) {
read_lock(&snd_card_rwlock);
mutex_lock(&snd_card_mutex);
if ((card = snd_cards[idx]) != NULL) {
count++;
snd_iprintf(buffer, "%2i [%-15s]: %s - %s\n",
Expand All @@ -538,7 +549,7 @@ static void snd_card_info_read(struct snd_info_entry *entry,
snd_iprintf(buffer, " %s\n",
card->longname);
}
read_unlock(&snd_card_rwlock);
mutex_unlock(&snd_card_mutex);
}
if (!count)
snd_iprintf(buffer, "--- no soundcards ---\n");
Expand All @@ -552,12 +563,12 @@ void snd_card_info_read_oss(struct snd_info_buffer *buffer)
struct snd_card *card;

for (idx = count = 0; idx < SNDRV_CARDS; idx++) {
read_lock(&snd_card_rwlock);
mutex_lock(&snd_card_mutex);
if ((card = snd_cards[idx]) != NULL) {
count++;
snd_iprintf(buffer, "%s\n", card->longname);
}
read_unlock(&snd_card_rwlock);
mutex_unlock(&snd_card_mutex);
}
if (!count) {
snd_iprintf(buffer, "--- no soundcards ---\n");
Expand All @@ -575,11 +586,11 @@ static void snd_card_module_info_read(struct snd_info_entry *entry,
struct snd_card *card;

for (idx = 0; idx < SNDRV_CARDS; idx++) {
read_lock(&snd_card_rwlock);
mutex_lock(&snd_card_mutex);
if ((card = snd_cards[idx]) != NULL)
snd_iprintf(buffer, "%2i %s\n",
idx, card->module->name);
read_unlock(&snd_card_rwlock);
mutex_unlock(&snd_card_mutex);
}
}
#endif
Expand Down
7 changes: 1 addition & 6 deletions trunk/sound/core/sound.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,14 +81,9 @@ extern struct class *sound_class;
*/
void snd_request_card(int card)
{
int locked;

if (! current->fs->root)
return;
read_lock(&snd_card_rwlock);
locked = snd_cards_lock & (1 << card);
read_unlock(&snd_card_rwlock);
if (locked)
if (snd_card_locked(card))
return;
if (card < 0 || card >= cards_limit)
return;
Expand Down

0 comments on commit 7961735

Please sign in to comment.