ALSA: hda: read CORBWP inside reg_lock

This converts the last CORBWP access outside of reg_lock. Signed-off-by: Wu Fengguang <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
goeke · Aug 3, 2009 · c32649f · c32649f
1 parent cdb1fbf
commit c32649f
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
@@ -588,15 +588,17 @@ static int azx_corb_send_cmd(struct hda_bus *bus, u32 val)
 	unsigned int addr = azx_command_addr(val);
 	unsigned int wp;
 
+	spin_lock_irq(&chip->reg_lock);
+
 	/* add command to corb */
 	wp = azx_readb(chip, CORBWP);
 	wp++;
 	wp %= ICH6_MAX_CORB_ENTRIES;
 
-	spin_lock_irq(&chip->reg_lock);
 	chip->rirb.cmds[addr]++;
 	chip->corb.buf[wp] = cpu_to_le32(val);
 	azx_writel(chip, CORBWP, wp);
+
 	spin_unlock_irq(&chip->reg_lock);
 
 	return 0;