diff options
| author | Takashi Iwai <tiwai@suse.de> | 2006-05-15 13:49:05 -0400 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2006-06-22 15:33:37 -0400 |
| commit | 746df94898554b3d8e91d855e934852e626c701c (patch) | |
| tree | dc312e426d52804d98080af18f12f5b14010d2e5 /include | |
| parent | 0defb2672d7cde8d048eec35c183da7b88adbd9e (diff) | |
[ALSA] Fix rwlock around snd_iprintf() in sound core
Fixed rwlock around snd_iprintf() in sound core part.
Replaced with mutex.
Also, make mutex and flags static variables with addition of
snd_card_locked() function (just for sound.c).
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/core.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/sound/core.h b/include/sound/core.h index 5135147f20e8..5d184be0ff72 100644 --- a/include/sound/core.h +++ b/include/sound/core.h | |||
| @@ -233,9 +233,8 @@ int copy_from_user_toio(volatile void __iomem *dst, const void __user *src, size | |||
| 233 | 233 | ||
| 234 | /* init.c */ | 234 | /* init.c */ |
| 235 | 235 | ||
| 236 | extern unsigned int snd_cards_lock; | ||
| 237 | extern struct snd_card *snd_cards[SNDRV_CARDS]; | 236 | extern struct snd_card *snd_cards[SNDRV_CARDS]; |
| 238 | extern rwlock_t snd_card_rwlock; | 237 | int snd_card_locked(int card); |
| 239 | #if defined(CONFIG_SND_MIXER_OSS) || defined(CONFIG_SND_MIXER_OSS_MODULE) | 238 | #if defined(CONFIG_SND_MIXER_OSS) || defined(CONFIG_SND_MIXER_OSS_MODULE) |
| 240 | #define SND_MIXER_OSS_NOTIFY_REGISTER 0 | 239 | #define SND_MIXER_OSS_NOTIFY_REGISTER 0 |
| 241 | #define SND_MIXER_OSS_NOTIFY_DISCONNECT 1 | 240 | #define SND_MIXER_OSS_NOTIFY_DISCONNECT 1 |