|
@@ -1295,10 +1295,7 @@ static int snd_ice1712_pcm_profi(struct snd_ice1712 *ice, int device, struct snd
|
|
|
return err;
|
|
|
}
|
|
|
|
|
|
- err = snd_ice1712_build_pro_mixer(ice);
|
|
|
- if (err < 0)
|
|
|
- return err;
|
|
|
- return 0;
|
|
|
+ return snd_ice1712_build_pro_mixer(ice);
|
|
|
}
|
|
|
|
|
|
/*
|
|
@@ -1545,10 +1542,9 @@ static int snd_ice1712_ac97_mixer(struct snd_ice1712 *ice)
|
|
|
dev_warn(ice->card->dev,
|
|
|
"cannot initialize ac97 for consumer, skipped\n");
|
|
|
else {
|
|
|
- err = snd_ctl_add(ice->card, snd_ctl_new1(&snd_ice1712_mixer_digmix_route_ac97, ice));
|
|
|
- if (err < 0)
|
|
|
- return err;
|
|
|
- return 0;
|
|
|
+ return snd_ctl_add(ice->card,
|
|
|
+ snd_ctl_new1(&snd_ice1712_mixer_digmix_route_ac97,
|
|
|
+ ice));
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -2497,11 +2493,8 @@ static int snd_ice1712_build_controls(struct snd_ice1712 *ice)
|
|
|
err = snd_ctl_add(ice->card, snd_ctl_new1(&snd_ice1712_mixer_pro_volume_rate, ice));
|
|
|
if (err < 0)
|
|
|
return err;
|
|
|
- err = snd_ctl_add(ice->card, snd_ctl_new1(&snd_ice1712_mixer_pro_peak, ice));
|
|
|
- if (err < 0)
|
|
|
- return err;
|
|
|
-
|
|
|
- return 0;
|
|
|
+ return snd_ctl_add(ice->card,
|
|
|
+ snd_ctl_new1(&snd_ice1712_mixer_pro_peak, ice));
|
|
|
}
|
|
|
|
|
|
static int snd_ice1712_free(struct snd_ice1712 *ice)
|