aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/sound/opl3.h1
-rw-r--r--sound/drivers/opl3/opl3_lib.c1
-rw-r--r--sound/drivers/opl3/opl3_seq.c1
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 {
318 void *private_data; 318 void *private_data;
319 void (*private_free)(struct snd_opl3 *); 319 void (*private_free)(struct snd_opl3 *);
320 320
321 struct snd_hwdep *hwdep;
321 spinlock_t reg_lock; 322 spinlock_t reg_lock;
322 struct snd_card *card; /* The card that this belongs to */ 323 struct snd_card *card; /* The card that this belongs to */
323 unsigned char fm_mode; /* OPL mode, see SNDRV_DM_FM_MODE_XXX */ 324 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,
525 hw->ops.write = snd_opl3_write; 525 hw->ops.write = snd_opl3_write;
526 hw->ops.release = snd_opl3_release; 526 hw->ops.release = snd_opl3_release;
527 527
528 opl3->hwdep = hw;
528 opl3->seq_dev_num = seq_device; 529 opl3->seq_dev_num = seq_device;
529#if defined(CONFIG_SND_SEQUENCER) || (defined(MODULE) && defined(CONFIG_SND_SEQUENCER_MODULE)) 530#if defined(CONFIG_SND_SEQUENCER) || (defined(MODULE) && defined(CONFIG_SND_SEQUENCER_MODULE))
530 if (snd_seq_device_new(card, seq_device, SNDRV_SEQ_DEV_ID_OPL3, 531 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)
82void snd_opl3_synth_cleanup(struct snd_opl3 * opl3) 82void snd_opl3_synth_cleanup(struct snd_opl3 * opl3)
83{ 83{
84 unsigned long flags; 84 unsigned long flags;
85 struct snd_hwdep *hwdep;
85 86
86 /* Stop system timer */ 87 /* Stop system timer */
87 spin_lock_irqsave(&opl3->sys_timer_lock, flags); 88 spin_lock_irqsave(&opl3->sys_timer_lock, flags);