|
@@ -300,6 +300,8 @@ static int wm9705_reset(struct snd_soc_codec *codec)
|
|
return 0; /* Success */
|
|
return 0; /* Success */
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ dev_err(codec->dev, "Failed to reset: AC97 link error\n");
|
|
|
|
+
|
|
return -EIO;
|
|
return -EIO;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -317,10 +319,8 @@ static int wm9705_soc_resume(struct snd_soc_codec *codec)
|
|
u16 *cache = codec->reg_cache;
|
|
u16 *cache = codec->reg_cache;
|
|
|
|
|
|
ret = wm9705_reset(codec);
|
|
ret = wm9705_reset(codec);
|
|
- if (ret < 0) {
|
|
|
|
- printk(KERN_ERR "could not reset AC97 codec\n");
|
|
|
|
|
|
+ if (ret < 0)
|
|
return ret;
|
|
return ret;
|
|
- }
|
|
|
|
|
|
|
|
for (i = 2; i < ARRAY_SIZE(wm9705_reg) << 1; i += 2) {
|
|
for (i = 2; i < ARRAY_SIZE(wm9705_reg) << 1; i += 2) {
|
|
soc_ac97_ops->write(codec->ac97, i, cache[i>>1]);
|
|
soc_ac97_ops->write(codec->ac97, i, cache[i>>1]);
|
|
@@ -339,7 +339,7 @@ static int wm9705_soc_probe(struct snd_soc_codec *codec)
|
|
|
|
|
|
ret = snd_soc_new_ac97_codec(codec, soc_ac97_ops, 0);
|
|
ret = snd_soc_new_ac97_codec(codec, soc_ac97_ops, 0);
|
|
if (ret < 0) {
|
|
if (ret < 0) {
|
|
- printk(KERN_ERR "wm9705: failed to register AC97 codec\n");
|
|
|
|
|
|
+ dev_err(codec->dev, "Failed to register AC97 codec\n");
|
|
return ret;
|
|
return ret;
|
|
}
|
|
}
|
|
|
|
|