Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 2641
b: refs/heads/master
c: ce43fba
h: refs/heads/master
i:
  2639: 6ca2606
v: v3
  • Loading branch information
Takashi Iwai authored and Jaroslav Kysela committed Jun 22, 2005
1 parent edf8d24 commit 0310261
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 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: b6a969155b04416185f368bd4e2f1d49b17c1ee1
refs/heads/master: ce43fbaececc82196d321671159483b3287de128
5 changes: 4 additions & 1 deletion trunk/sound/pci/hda/hda_intel.c
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,7 @@ struct snd_azx {

/* flags */
int position_fix;
unsigned int initialized: 1;
};

/*
Expand Down Expand Up @@ -1235,7 +1236,7 @@ static int azx_resume(snd_card_t *card)
*/
static int azx_free(azx_t *chip)
{
if (chip->remap_addr) {
if (chip->initialized) {
int i;

for (i = 0; i < MAX_ICH6_DEV; i++)
Expand Down Expand Up @@ -1361,6 +1362,8 @@ static int __devinit azx_create(snd_card_t *card, struct pci_dev *pci,
/* initialize chip */
azx_init_chip(chip);

chip->initialized = 1;

/* codec detection */
if (! chip->codec_mask) {
snd_printk(KERN_ERR SFX "no codecs found!\n");
Expand Down

0 comments on commit 0310261

Please sign in to comment.