aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/ctxfi/ctatc.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/pci/ctxfi/ctatc.c')
-rw-r--r--sound/pci/ctxfi/ctatc.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/sound/pci/ctxfi/ctatc.c b/sound/pci/ctxfi/ctatc.c
index f52345002334..ead104ea1e35 100644
--- a/sound/pci/ctxfi/ctatc.c
+++ b/sound/pci/ctxfi/ctatc.c
@@ -191,7 +191,7 @@ static unsigned int convert_format(snd_pcm_format_t snd_format)
191 case SNDRV_PCM_FORMAT_S32_LE: 191 case SNDRV_PCM_FORMAT_S32_LE:
192 return SRC_SF_S32; 192 return SRC_SF_S32;
193 default: 193 default:
194 printk(KERN_ERR "not recognized snd format is %d \n", 194 printk(KERN_ERR "ctxfi: not recognized snd format is %d \n",
195 snd_format); 195 snd_format);
196 return SRC_SF_S16; 196 return SRC_SF_S16;
197 } 197 }
@@ -1254,7 +1254,8 @@ static int ct_create_alsa_devs(struct ct_atc *atc)
1254 err = alsa_dev_funcs[i].create(atc, i, 1254 err = alsa_dev_funcs[i].create(atc, i,
1255 alsa_dev_funcs[i].public_name); 1255 alsa_dev_funcs[i].public_name);
1256 if (err) { 1256 if (err) {
1257 printk(KERN_ERR "Creating alsa device %d failed!\n", i); 1257 printk(KERN_ERR "ctxfi: "
1258 "Creating alsa device %d failed!\n", i);
1258 return err; 1259 return err;
1259 } 1260 }
1260 } 1261 }
@@ -1289,7 +1290,8 @@ static int atc_create_hw_devs(struct ct_atc *atc)
1289 1290
1290 err = rsc_mgr_funcs[i].create(atc->hw, &atc->rsc_mgrs[i]); 1291 err = rsc_mgr_funcs[i].create(atc->hw, &atc->rsc_mgrs[i]);
1291 if (err) { 1292 if (err) {
1292 printk(KERN_ERR "Failed to create rsc_mgr %d!!!\n", i); 1293 printk(KERN_ERR "ctxfi: "
1294 "Failed to create rsc_mgr %d!!!\n", i);
1293 return err; 1295 return err;
1294 } 1296 }
1295 } 1297 }
@@ -1333,7 +1335,7 @@ static int atc_get_resources(struct ct_atc *atc)
1333 err = daio_mgr->get_daio(daio_mgr, &da_desc, 1335 err = daio_mgr->get_daio(daio_mgr, &da_desc,
1334 (struct daio **)&atc->daios[i]); 1336 (struct daio **)&atc->daios[i]);
1335 if (err) { 1337 if (err) {
1336 printk(KERN_ERR "Failed to get DAIO " 1338 printk(KERN_ERR "ctxfi: Failed to get DAIO "
1337 "resource %d!!!\n", i); 1339 "resource %d!!!\n", i);
1338 return err; 1340 return err;
1339 } 1341 }
@@ -1349,7 +1351,7 @@ static int atc_get_resources(struct ct_atc *atc)
1349 err = daio_mgr->get_daio(daio_mgr, &da_desc, 1351 err = daio_mgr->get_daio(daio_mgr, &da_desc,
1350 (struct daio **)&atc->daios[i]); 1352 (struct daio **)&atc->daios[i]);
1351 if (err) { 1353 if (err) {
1352 printk(KERN_ERR "Failed to get S/PDIF-in resource!!!\n"); 1354 printk(KERN_ERR "ctxfi: Failed to get S/PDIF-in resource!!!\n");
1353 return err; 1355 return err;
1354 } 1356 }
1355 atc->n_daio++; 1357 atc->n_daio++;
@@ -1400,7 +1402,7 @@ static int atc_get_resources(struct ct_atc *atc)
1400 1402
1401 err = ct_mixer_create(atc, (struct ct_mixer **)&atc->mixer); 1403 err = ct_mixer_create(atc, (struct ct_mixer **)&atc->mixer);
1402 if (err) { 1404 if (err) {
1403 printk(KERN_ERR "Failed to create mixer obj!!!\n"); 1405 printk(KERN_ERR "ctxfi: Failed to create mixer obj!!!\n");
1404 return err; 1406 return err;
1405 } 1407 }
1406 1408
@@ -1600,7 +1602,7 @@ int ct_atc_create(struct snd_card *card, struct pci_dev *pci,
1600 1602
1601error1: 1603error1:
1602 ct_atc_destroy(atc); 1604 ct_atc_destroy(atc);
1603 printk(KERN_ERR "Something wrong!!!\n"); 1605 printk(KERN_ERR "ctxfi: Something wrong!!!\n");
1604 return err; 1606 return err;
1605} 1607}
1606 1608