diff options
Diffstat (limited to 'sound/pci/atiixp.c')
-rw-r--r-- | sound/pci/atiixp.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/pci/atiixp.c b/sound/pci/atiixp.c index 188df085b7ee..241eacf1e652 100644 --- a/sound/pci/atiixp.c +++ b/sound/pci/atiixp.c | |||
@@ -1453,6 +1453,7 @@ static int snd_atiixp_resume(snd_card_t *card) | |||
1453 | atiixp_dma_t *dma = &chip->dmas[i]; | 1453 | atiixp_dma_t *dma = &chip->dmas[i]; |
1454 | if (dma->substream && dma->suspended) { | 1454 | if (dma->substream && dma->suspended) { |
1455 | dma->ops->enable_dma(chip, 1); | 1455 | dma->ops->enable_dma(chip, 1); |
1456 | dma->substream->ops->prepare(dma->substream); | ||
1456 | writel((u32)dma->desc_buf.addr | ATI_REG_LINKPTR_EN, | 1457 | writel((u32)dma->desc_buf.addr | ATI_REG_LINKPTR_EN, |
1457 | chip->remap_addr + dma->ops->llp_offset); | 1458 | chip->remap_addr + dma->ops->llp_offset); |
1458 | writel(dma->saved_curptr, chip->remap_addr + dma->ops->dt_cur); | 1459 | writel(dma->saved_curptr, chip->remap_addr + dma->ops->dt_cur); |
@@ -1530,7 +1531,7 @@ static int __devinit snd_atiixp_create(snd_card_t *card, | |||
1530 | if ((err = pci_enable_device(pci)) < 0) | 1531 | if ((err = pci_enable_device(pci)) < 0) |
1531 | return err; | 1532 | return err; |
1532 | 1533 | ||
1533 | chip = kcalloc(1, sizeof(*chip), GFP_KERNEL); | 1534 | chip = kzalloc(sizeof(*chip), GFP_KERNEL); |
1534 | if (chip == NULL) { | 1535 | if (chip == NULL) { |
1535 | pci_disable_device(pci); | 1536 | pci_disable_device(pci); |
1536 | return -ENOMEM; | 1537 | return -ENOMEM; |
@@ -1644,6 +1645,7 @@ static void __devexit snd_atiixp_remove(struct pci_dev *pci) | |||
1644 | 1645 | ||
1645 | static struct pci_driver driver = { | 1646 | static struct pci_driver driver = { |
1646 | .name = "ATI IXP AC97 controller", | 1647 | .name = "ATI IXP AC97 controller", |
1648 | .owner = THIS_MODULE, | ||
1647 | .id_table = snd_atiixp_ids, | 1649 | .id_table = snd_atiixp_ids, |
1648 | .probe = snd_atiixp_probe, | 1650 | .probe = snd_atiixp_probe, |
1649 | .remove = __devexit_p(snd_atiixp_remove), | 1651 | .remove = __devexit_p(snd_atiixp_remove), |