Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 148430
b: refs/heads/master
c: 8174086
h: refs/heads/master
v: v3
  • Loading branch information
Takashi Iwai committed May 26, 2009
1 parent 404a741 commit ffcfbf2
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 20e91c575088337cb94f2ed48380efc305dcb81d
refs/heads/master: 8174086167d43d0fd7b21928074145ae1d15bbab
13 changes: 5 additions & 8 deletions trunk/sound/pci/hda/hda_intel.c
Original file line number Diff line number Diff line change
Expand Up @@ -901,8 +901,7 @@ static void azx_init_chip(struct azx *chip)
azx_int_enable(chip);

/* initialize the codec command I/O */
if (!chip->single_cmd)
azx_init_cmd_io(chip);
azx_init_cmd_io(chip);

/* program the position buffer */
azx_writel(chip, DPLBASE, (u32)chip->posbuf.addr);
Expand Down Expand Up @@ -1018,7 +1017,7 @@ static irqreturn_t azx_interrupt(int irq, void *dev_id)
/* clear rirb int */
status = azx_readb(chip, RIRBSTS);
if (status & RIRB_INT_MASK) {
if (!chip->single_cmd && (status & RIRB_INT_RESPONSE))
if (status & RIRB_INT_RESPONSE)
azx_update_rirb(chip);
azx_writeb(chip, RIRBSTS, RIRB_INT_MASK);
}
Expand Down Expand Up @@ -2338,11 +2337,9 @@ static int __devinit azx_create(struct snd_card *card, struct pci_dev *pci,
goto errout;
}
/* allocate CORB/RIRB */
if (!chip->single_cmd) {
err = azx_alloc_cmd_io(chip);
if (err < 0)
goto errout;
}
err = azx_alloc_cmd_io(chip);
if (err < 0)
goto errout;

/* initialize streams */
azx_init_stream(chip);
Expand Down

0 comments on commit ffcfbf2

Please sign in to comment.