kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[ALSA] opl3 - Fix build errors

Browse source 
I applied a wrong patch for 'opl3 - simplify exclusive access lock'.
Fixed now.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Takashi Iwai 2007-10-30 12:43:40 +01:00 committed by Jaroslav Kysela
parent e5723b41ab
commit 045765253c
3 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/sound/opl3.h
View file

@ -318,6 +318,7 @@ struct snd_opl3 {
void *private_data; void *private_data;
void (*private_free)(struct snd_opl3 *); void (*private_free)(struct snd_opl3 *);
struct snd_hwdep *hwdep;
spinlock_t reg_lock; spinlock_t reg_lock;
struct snd_card *card; /* The card that this belongs to */ struct snd_card *card; /* The card that this belongs to */
unsigned char fm_mode; /* OPL mode, see SNDRV_DM_FM_MODE_XXX */ unsigned char fm_mode; /* OPL mode, see SNDRV_DM_FM_MODE_XXX */

1
sound/drivers/opl3/opl3_lib.c
View file

@ -525,6 +525,7 @@ int snd_opl3_hwdep_new(struct snd_opl3 * opl3,
hw->ops.write = snd_opl3_write; hw->ops.write = snd_opl3_write;
hw->ops.release = snd_opl3_release; hw->ops.release = snd_opl3_release;
opl3->hwdep = hw;
opl3->seq_dev_num = seq_device; opl3->seq_dev_num = seq_device;
#if defined(CONFIG_SND_SEQUENCER) || (defined(MODULE) && defined(CONFIG_SND_SEQUENCER_MODULE)) #if defined(CONFIG_SND_SEQUENCER) || (defined(MODULE) && defined(CONFIG_SND_SEQUENCER_MODULE))
if (snd_seq_device_new(card, seq_device, SNDRV_SEQ_DEV_ID_OPL3, if (snd_seq_device_new(card, seq_device, SNDRV_SEQ_DEV_ID_OPL3,

1
sound/drivers/opl3/opl3_seq.c
View file

@ -82,6 +82,7 @@ int snd_opl3_synth_setup(struct snd_opl3 * opl3)
void snd_opl3_synth_cleanup(struct snd_opl3 * opl3) void snd_opl3_synth_cleanup(struct snd_opl3 * opl3)
{ {
unsigned long flags; unsigned long flags;
struct snd_hwdep *hwdep;
/* Stop system timer */ /* Stop system timer */
spin_lock_irqsave(&opl3->sys_timer_lock, flags); spin_lock_irqsave(&opl3->sys_timer_lock, flags);