From 905b41956c81e5914470a13a166d4b4c4ee71f92 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Thu, 16 Feb 2012 10:33:45 +0800 Subject: ASoC: Show device id in the debug message Show the id we read when the id mismatch is detected. This is useful for debugging. Signed-off-by: Axel Lin Signed-off-by: Mark Brown diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index 172dcac..5a6516e 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -3718,7 +3718,7 @@ static __devinit int wm8962_i2c_probe(struct i2c_client *i2c, } if (reg != 0x6243) { dev_err(&i2c->dev, - "Device is not a WM8962, ID %x != 0x6243\n", ret); + "Device is not a WM8962, ID %x != 0x6243\n", reg); ret = -EINVAL; goto err_regmap; } diff --git a/sound/soc/codecs/wm8996.c b/sound/soc/codecs/wm8996.c index 759ea69..c3bde4a 100644 --- a/sound/soc/codecs/wm8996.c +++ b/sound/soc/codecs/wm8996.c @@ -3185,7 +3185,7 @@ static __devinit int wm8996_i2c_probe(struct i2c_client *i2c, goto err_regmap; } if (reg != 0x8915) { - dev_err(&i2c->dev, "Device is not a WM8996, ID %x\n", ret); + dev_err(&i2c->dev, "Device is not a WM8996, ID %x\n", reg); ret = -EINVAL; goto err_regmap; } diff --git a/sound/soc/codecs/wm9090.c b/sound/soc/codecs/wm9090.c index e8280ee..4b263b6 100644 --- a/sound/soc/codecs/wm9090.c +++ b/sound/soc/codecs/wm9090.c @@ -639,7 +639,7 @@ static int wm9090_i2c_probe(struct i2c_client *i2c, if (ret < 0) goto err; if (reg != 0x9093) { - dev_err(&i2c->dev, "Device is not a WM9090, ID=%x\n", ret); + dev_err(&i2c->dev, "Device is not a WM9090, ID=%x\n", reg); ret = -ENODEV; goto err; } -- cgit v0.10.2