diff options
| author | Wu Fengguang <fengguang.wu@intel.com> | 2009-08-01 18:47:41 +0800 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-08-03 08:26:42 +0200 |
| commit | cdb1fbf23181c133fb24f12ad14ccea7dc399599 (patch) | |
| tree | 7bb40ad22516f51e31a8e4aa11db0facd75fd574 /sound/pci | |
| parent | a678cdee25a387c8fc3b2754974695412baf1d85 (diff) | |
| download | op-kernel-dev-cdb1fbf23181c133fb24f12ad14ccea7dc399599.zip op-kernel-dev-cdb1fbf23181c133fb24f12ad14ccea7dc399599.tar.gz | |
ALSA: hda: take reg_lock in azx_init_cmd_io/azx_free_cmd_io
Just for safety. azx_init_cmd_io() and azx_free_cmd_io() may be
called when switching to single command mode.
Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
| -rw-r--r-- | sound/pci/hda/hda_intel.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index ddabc82..b6e6314 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -513,6 +513,7 @@ static int azx_alloc_cmd_io(struct azx *chip) static void azx_init_cmd_io(struct azx *chip) { + spin_lock_irq(&chip->reg_lock); /* CORB set up */ chip->corb.addr = chip->rb.addr; chip->corb.buf = (u32 *)chip->rb.area; @@ -544,13 +545,16 @@ static void azx_init_cmd_io(struct azx *chip) azx_writew(chip, RINTCNT, 1); /* enable rirb dma and response irq */ azx_writeb(chip, RIRBCTL, ICH6_RBCTL_DMA_EN | ICH6_RBCTL_IRQ_EN); + spin_unlock_irq(&chip->reg_lock); } static void azx_free_cmd_io(struct azx *chip) { + spin_lock_irq(&chip->reg_lock); /* disable ringbuffer DMAs */ azx_writeb(chip, RIRBCTL, 0); azx_writeb(chip, CORBCTL, 0); + spin_unlock_irq(&chip->reg_lock); } static unsigned int azx_command_addr(u32 cmd) |
