提交 04576525 编写于 作者: T Takashi Iwai 提交者: Jaroslav Kysela

[ALSA] opl3 - Fix build errors

I applied a wrong patch for 'opl3 - simplify exclusive access lock'.
Fixed now.
Signed-off-by: NTakashi Iwai <tiwai@suse.de>
Signed-off-by: NJaroslav Kysela <perex@perex.cz>
上级 e5723b41
...@@ -318,6 +318,7 @@ struct snd_opl3 { ...@@ -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 */
......
...@@ -525,6 +525,7 @@ int snd_opl3_hwdep_new(struct snd_opl3 * opl3, ...@@ -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,
......
...@@ -82,6 +82,7 @@ int snd_opl3_synth_setup(struct snd_opl3 * opl3) ...@@ -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);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册