1 files changed, 9 insertions, 4 deletions

diff --git a/sound/pci/atiixp.c b/sound/pci/atiixp.c
index 457228fb22aa..085a52b8c807 100644
--- a/sound/pci/atiixp.c
+++ b/sound/pci/atiixp.c
@@ -37,7 +37,7 @@
 MODULE_AUTHOR("Takashi Iwai <tiwai@suse.de>");
 MODULE_DESCRIPTION("ATI IXP AC97 controller");
 MODULE_LICENSE("GPL");
-MODULE_SUPPORTED_DEVICE("{{ATI,IXP150/200/250/300/400}}");
+MODULE_SUPPORTED_DEVICE("{{ATI,IXP150/200/250/300/400/600}}");
 
 static int index = SNDRV_DEFAULT_IDX1;  /* Index 0-MAX */
 static char *id = SNDRV_DEFAULT_STR1;   /* ID for this card */
@@ -290,6 +290,7 @@ static struct pci_device_id snd_atiixp_ids[] = {
         { 0x1002, 0x4341, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* SB200 */
         { 0x1002, 0x4361, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* SB300 */
         { 0x1002, 0x4370, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* SB400 */
+        { 0x1002, 0x4382, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* SB600 */
         { 0, }
 };
 
@@ -722,7 +723,9 @@ static int snd_atiixp_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
         struct atiixp_dma *dma = substream->runtime->private_data;
         int err = 0;
 
-        snd_assert(dma->ops->enable_transfer && dma->ops->flush_dma, return -EINVAL);
+        if (snd_BUG_ON(!dma->ops->enable_transfer ||
+                       !dma->ops->flush_dma))
+                return -EINVAL;
 
         spin_lock(&chip->reg_lock);
         switch (cmd) {
@@ -1032,7 +1035,8 @@ static int snd_atiixp_pcm_open(struct snd_pcm_substream *substream,
         struct snd_pcm_runtime *runtime = substream->runtime;
         int err;
 
-        snd_assert(dma->ops && dma->ops->enable_dma, return -EINVAL);
+        if (snd_BUG_ON(!dma->ops || !dma->ops->enable_dma))
+                return -EINVAL;
 
         if (dma->opened)
                 return -EBUSY;
@@ -1064,7 +1068,8 @@ static int snd_atiixp_pcm_close(struct snd_pcm_substream *substream,
 {
         struct atiixp *chip = snd_pcm_substream_chip(substream);
         /* disable DMA bits */
-        snd_assert(dma->ops && dma->ops->enable_dma, return -EINVAL);
+        if (snd_BUG_ON(!dma->ops || !dma->ops->enable_dma))
+                return -EINVAL;
         spin_lock_irq(&chip->reg_lock);
         dma->ops->enable_dma(chip, 0);
         spin_unlock_irq(&chip->reg_lock);