[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>

diff --git a/include/sound/opl3.h b/include/sound/opl3.h
index eea584b7bfc58e9eafe713c382897bda849cfb04..d7e33ce09120bb464c7eb0ed333de90c49fcd89f 100644 (file)
--- 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 a1270841290bd2de9cda56e7ddd870a230a267ab..ebe4359047cb2deb90fdc952ccae21d7ce555c38 100644 (file)
--- 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 6fd60b7e5805532625e77b653553b21cc743c1da..2d33f53d36b8227a0ed520a7ec236f02b2df944c 100644 (file)
--- 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);