diff options
Diffstat (limited to 'sound/pci/ice1712/ice1712.c')
-rw-r--r-- | sound/pci/ice1712/ice1712.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c index 58d7cda03de5..3dd63f1cda53 100644 --- a/sound/pci/ice1712/ice1712.c +++ b/sound/pci/ice1712/ice1712.c | |||
@@ -458,7 +458,7 @@ static irqreturn_t snd_ice1712_interrupt(int irq, void *dev_id) | |||
458 | u16 pbkstatus; | 458 | u16 pbkstatus; |
459 | struct snd_pcm_substream *substream; | 459 | struct snd_pcm_substream *substream; |
460 | pbkstatus = inw(ICEDS(ice, INTSTAT)); | 460 | pbkstatus = inw(ICEDS(ice, INTSTAT)); |
461 | /* printk("pbkstatus = 0x%x\n", pbkstatus); */ | 461 | /* printk(KERN_DEBUG "pbkstatus = 0x%x\n", pbkstatus); */ |
462 | for (idx = 0; idx < 6; idx++) { | 462 | for (idx = 0; idx < 6; idx++) { |
463 | if ((pbkstatus & (3 << (idx * 2))) == 0) | 463 | if ((pbkstatus & (3 << (idx * 2))) == 0) |
464 | continue; | 464 | continue; |
@@ -2648,9 +2648,9 @@ static int __devinit snd_ice1712_probe(struct pci_dev *pci, | |||
2648 | return -ENOENT; | 2648 | return -ENOENT; |
2649 | } | 2649 | } |
2650 | 2650 | ||
2651 | card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0); | 2651 | err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card); |
2652 | if (card == NULL) | 2652 | if (err < 0) |
2653 | return -ENOMEM; | 2653 | return err; |
2654 | 2654 | ||
2655 | strcpy(card->driver, "ICE1712"); | 2655 | strcpy(card->driver, "ICE1712"); |
2656 | strcpy(card->shortname, "ICEnsemble ICE1712"); | 2656 | strcpy(card->shortname, "ICEnsemble ICE1712"); |