[ALSA] opl3 - Fix build errors · tjh.dev/kernel@0457652

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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

authored by

Takashi Iwai and committed by

Jaroslav Kysela 18 years ago 04576525 e5723b41

3 changed files

expand all

include

sound

opl3.h

sound

drivers

opl3

opl3_lib.c

opl3_seq.c

include/sound/opl3.h

··· 318 318 void *private_data; 319 319 void (*private_free)(struct snd_opl3 *); 320 320 321 + struct snd_hwdep *hwdep; 321 322 spinlock_t reg_lock; 322 323 struct snd_card *card; /* The card that this belongs to */ 323 324 unsigned char fm_mode; /* OPL mode, see SNDRV_DM_FM_MODE_XXX */

sound/drivers/opl3/opl3_lib.c

··· 525 525 hw->ops.write = snd_opl3_write; 526 526 hw->ops.release = snd_opl3_release; 527 527 528 + opl3->hwdep = hw; 528 529 opl3->seq_dev_num = seq_device; 529 530 #if defined(CONFIG_SND_SEQUENCER) || (defined(MODULE) && defined(CONFIG_SND_SEQUENCER_MODULE)) 530 531 if (snd_seq_device_new(card, seq_device, SNDRV_SEQ_DEV_ID_OPL3,

sound/drivers/opl3/opl3_seq.c

··· 82 82 void snd_opl3_synth_cleanup(struct snd_opl3 * opl3) 83 83 { 84 84 unsigned long flags; 85 + struct snd_hwdep *hwdep; 85 86 86 87 /* Stop system timer */ 87 88 spin_lock_irqsave(&opl3->sys_timer_lock, flags);