3 files changed, 10 insertions, 7 deletions

diff --git a/sound/pci/ice1712/amp.c b/sound/pci/ice1712/amp.c
index e328cfb7620..e525da2673b 100644
--- a/sound/pci/ice1712/amp.c
+++ b/sound/pci/ice1712/amp.c
@@ -68,8 +68,11 @@ static int __devinit snd_vt1724_amp_init(struct snd_ice1712 *ice)
 
 static int __devinit snd_vt1724_amp_add_controls(struct snd_ice1712 *ice)
 {
-        /* we use pins 39 and 41 of the VT1616 for left and right read outputs */
-        snd_ac97_write_cache(ice->ac97, 0x5a, snd_ac97_read(ice->ac97, 0x5a) & ~0x8000);
+        if (ice->ac97)
+                /* we use pins 39 and 41 of the VT1616 for left and right
+                read outputs */
+                snd_ac97_write_cache(ice->ac97, 0x5a,
+                        snd_ac97_read(ice->ac97, 0x5a) & ~0x8000);
         return 0;
 }
 
diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c
index f4594d76b6e..0ccc0eb7577 100644
--- a/sound/pci/ice1712/ice1712.c
+++ b/sound/pci/ice1712/ice1712.c
@@ -87,7 +87,7 @@ static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;	/* ID for this card */
 static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;/* Enable this card */
 static char *model[SNDRV_CARDS];
 static int omni[SNDRV_CARDS];                           /* Delta44 & 66 Omni I/O support */
-static int cs8427_timeout[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)] = 500}; /* CS8427 S/PDIF transciever reset timeout value in msec */
+static int cs8427_timeout[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)] = 500}; /* CS8427 S/PDIF transceiver reset timeout value in msec */
 static int dxr_enable[SNDRV_CARDS];                     /* DXR enable for DMX6FIRE */
 
 module_param_array(index, int, NULL, 0444);
@@ -2607,7 +2607,7 @@ static int __devinit snd_ice1712_create(struct snd_card *card,
         ice->profi_port = pci_resource_start(pci, 3);
 
         if (request_irq(pci->irq, snd_ice1712_interrupt, IRQF_SHARED,
-                        "ICE1712", ice)) {
+                        KBUILD_MODNAME, ice)) {
                 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                 snd_ice1712_free(ice);
                 return -EIO;
@@ -2802,7 +2802,7 @@ static void __devexit snd_ice1712_remove(struct pci_dev *pci)
 }
 
 static struct pci_driver driver = {
-        .name = "ICE1712",
+        .name = KBUILD_MODNAME,
         .id_table = snd_ice1712_ids,
         .probe = snd_ice1712_probe,
         .remove = __devexit_p(snd_ice1712_remove),
diff --git a/sound/pci/ice1712/ice1724.c b/sound/pci/ice1712/ice1724.c
index c1498fa5545..c2b7f8bc41e 100644
--- a/sound/pci/ice1712/ice1724.c
+++ b/sound/pci/ice1712/ice1724.c
@@ -2509,7 +2509,7 @@ static int __devinit snd_vt1724_create(struct snd_card *card,
         ice->profi_port = pci_resource_start(pci, 1);
 
         if (request_irq(pci->irq, snd_vt1724_interrupt,
-                        IRQF_SHARED, "ICE1724", ice)) {
+                        IRQF_SHARED, KBUILD_MODNAME, ice)) {
                 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                 snd_vt1724_free(ice);
                 return -EIO;
@@ -2802,7 +2802,7 @@ static int snd_vt1724_resume(struct pci_dev *pci)
 #endif
 
 static struct pci_driver driver = {
-        .name = "ICE1724",
+        .name = KBUILD_MODNAME,
         .id_table = snd_vt1724_ids,
         .probe = snd_vt1724_probe,
         .remove = __devexit_p(snd_vt1724_remove),