diff options
| author | Takashi Iwai <tiwai@suse.de> | 2007-10-30 12:43:40 +0100 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2008-01-31 17:29:14 +0100 |
| commit | 045765253c610cb5acebb22ae94d759f586d9521 (patch) | |
| tree | 3c8dd451c49f29fbfa0f6d50bb9ceabd6d33322d | |
| parent | e5723b41abe559bafc52591dcf8ee19cc131d3a1 (diff) | |
| download | kernel-common-045765253c610cb5acebb22ae94d759f586d9521.tar.gz kernel-common-045765253c610cb5acebb22ae94d759f586d9521.tar.bz2 kernel-common-045765253c610cb5acebb22ae94d759f586d9521.zip | |
[ALSA] opl3 - Fix build errors
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>
| -rw-r--r-- | include/sound/opl3.h | 1 | ||||
| -rw-r--r-- | sound/drivers/opl3/opl3_lib.c | 1 | ||||
| -rw-r--r-- | sound/drivers/opl3/opl3_seq.c | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/include/sound/opl3.h b/include/sound/opl3.h index eea584b7bfc5..d7e33ce09120 100644 --- a/include/sound/opl3.h +++ b/include/sound/opl3.h @@ -318,6 +318,7 @@ struct snd_opl3 { void *private_data; void (*private_free)(struct snd_opl3 *); + struct snd_hwdep *hwdep; spinlock_t reg_lock; struct snd_card *card; /* The card that this belongs to */ unsigned char fm_mode; /* OPL mode, see SNDRV_DM_FM_MODE_XXX */ diff --git a/sound/drivers/opl3/opl3_lib.c b/sound/drivers/opl3/opl3_lib.c index a1270841290b..ebe4359047cb 100644 --- a/sound/drivers/opl3/opl3_lib.c +++ b/sound/drivers/opl3/opl3_lib.c @@ -525,6 +525,7 @@ int snd_opl3_hwdep_new(struct snd_opl3 * opl3, hw->ops.write = snd_opl3_write; hw->ops.release = snd_opl3_release; + opl3->hwdep = hw; opl3->seq_dev_num = seq_device; #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, diff --git a/sound/drivers/opl3/opl3_seq.c b/sound/drivers/opl3/opl3_seq.c index 6fd60b7e5805..2d33f53d36b8 100644 --- a/sound/drivers/opl3/opl3_seq.c +++ b/sound/drivers/opl3/opl3_seq.c @@ -82,6 +82,7 @@ int snd_opl3_synth_setup(struct snd_opl3 * opl3) void snd_opl3_synth_cleanup(struct snd_opl3 * opl3) { unsigned long flags; + struct snd_hwdep *hwdep; /* Stop system timer */ spin_lock_irqsave(&opl3->sys_timer_lock, flags); |