* [PATCH v2] ASoC: cs42xx8: Check return value of regmap_read and report correct chipid value
@ 2014-04-04 3:04 Axel Lin
2014-04-04 3:32 ` Nicolin Chen
2014-04-04 10:11 ` Mark Brown
0 siblings, 2 replies; 3+ messages in thread
From: Axel Lin @ 2014-04-04 3:04 UTC (permalink / raw)
To: Mark Brown
Cc: Brian Austin, alsa-devel, Liam Girdwood, Paul Handrigan,
Nicolin Chen
Fix checking return value of regmap_read().
Also fix reporting the chip_id value. CS42XX8_CHIPID_CHIP_ID_MASK is 0xF0,
so the chip_id value is (val & CS42XX8_CHIPID_CHIP_ID_MASK) >> 4).
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Acked-by: Paul Handrigan <paul.handrigan@cirrus.com>
Acked-by: Brian Austin <brian.austin@cirrus.com>
---
sound/soc/codecs/cs42xx8.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/sound/soc/codecs/cs42xx8.c b/sound/soc/codecs/cs42xx8.c
index 082299a..8502032 100644
--- a/sound/soc/codecs/cs42xx8.c
+++ b/sound/soc/codecs/cs42xx8.c
@@ -495,17 +495,16 @@ int cs42xx8_probe(struct device *dev, struct regmap *regmap)
regcache_cache_bypass(cs42xx8->regmap, true);
/* Validate the chip ID */
- regmap_read(cs42xx8->regmap, CS42XX8_CHIPID, &val);
- if (val < 0) {
- dev_err(dev, "failed to get device ID: %x", val);
- ret = -EINVAL;
+ ret = regmap_read(cs42xx8->regmap, CS42XX8_CHIPID, &val);
+ if (ret < 0) {
+ dev_err(dev, "failed to get device ID, ret = %d", ret);
goto err_enable;
}
/* The top four bits of the chip ID should be 0000 */
- if ((val & CS42XX8_CHIPID_CHIP_ID_MASK) != 0x00) {
+ if (((val & CS42XX8_CHIPID_CHIP_ID_MASK) >> 4) != 0x00) {
dev_err(dev, "unmatched chip ID: %d\n",
- val & CS42XX8_CHIPID_CHIP_ID_MASK);
+ (val & CS42XX8_CHIPID_CHIP_ID_MASK) >> 4);
ret = -EINVAL;
goto err_enable;
}
--
1.8.3.2
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH v2] ASoC: cs42xx8: Check return value of regmap_read and report correct chipid value
2014-04-04 3:04 [PATCH v2] ASoC: cs42xx8: Check return value of regmap_read and report correct chipid value Axel Lin
@ 2014-04-04 3:32 ` Nicolin Chen
2014-04-04 10:11 ` Mark Brown
1 sibling, 0 replies; 3+ messages in thread
From: Nicolin Chen @ 2014-04-04 3:32 UTC (permalink / raw)
To: Axel Lin
Cc: alsa-devel, Brian Austin, Mark Brown, Liam Girdwood,
Paul Handrigan
On Fri, Apr 04, 2014 at 11:04:35AM +0800, Axel Lin wrote:
> Fix checking return value of regmap_read().
> Also fix reporting the chip_id value. CS42XX8_CHIPID_CHIP_ID_MASK is 0xF0,
> so the chip_id value is (val & CS42XX8_CHIPID_CHIP_ID_MASK) >> 4).
>
> Signed-off-by: Axel Lin <axel.lin@ingics.com>
> Acked-by: Paul Handrigan <paul.handrigan@cirrus.com>
> Acked-by: Brian Austin <brian.austin@cirrus.com>
Acked-by: Nicolin Chen <Guangyu.Chen@freescale.com>
Not sure if it's needed since both Brian and Paul acked.
Thanks for this fix,
Nicolin
> ---
> sound/soc/codecs/cs42xx8.c | 11 +++++------
> 1 file changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/sound/soc/codecs/cs42xx8.c b/sound/soc/codecs/cs42xx8.c
> index 082299a..8502032 100644
> --- a/sound/soc/codecs/cs42xx8.c
> +++ b/sound/soc/codecs/cs42xx8.c
> @@ -495,17 +495,16 @@ int cs42xx8_probe(struct device *dev, struct regmap *regmap)
> regcache_cache_bypass(cs42xx8->regmap, true);
>
> /* Validate the chip ID */
> - regmap_read(cs42xx8->regmap, CS42XX8_CHIPID, &val);
> - if (val < 0) {
> - dev_err(dev, "failed to get device ID: %x", val);
> - ret = -EINVAL;
> + ret = regmap_read(cs42xx8->regmap, CS42XX8_CHIPID, &val);
> + if (ret < 0) {
> + dev_err(dev, "failed to get device ID, ret = %d", ret);
> goto err_enable;
> }
>
> /* The top four bits of the chip ID should be 0000 */
> - if ((val & CS42XX8_CHIPID_CHIP_ID_MASK) != 0x00) {
> + if (((val & CS42XX8_CHIPID_CHIP_ID_MASK) >> 4) != 0x00) {
> dev_err(dev, "unmatched chip ID: %d\n",
> - val & CS42XX8_CHIPID_CHIP_ID_MASK);
> + (val & CS42XX8_CHIPID_CHIP_ID_MASK) >> 4);
> ret = -EINVAL;
> goto err_enable;
> }
> --
> 1.8.3.2
>
>
>
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH v2] ASoC: cs42xx8: Check return value of regmap_read and report correct chipid value
2014-04-04 3:04 [PATCH v2] ASoC: cs42xx8: Check return value of regmap_read and report correct chipid value Axel Lin
2014-04-04 3:32 ` Nicolin Chen
@ 2014-04-04 10:11 ` Mark Brown
1 sibling, 0 replies; 3+ messages in thread
From: Mark Brown @ 2014-04-04 10:11 UTC (permalink / raw)
To: Axel Lin
Cc: Brian Austin, alsa-devel, Liam Girdwood, Paul Handrigan,
Nicolin Chen
[-- Attachment #1.1: Type: text/plain, Size: 268 bytes --]
On Fri, Apr 04, 2014 at 11:04:35AM +0800, Axel Lin wrote:
> Fix checking return value of regmap_read().
> Also fix reporting the chip_id value. CS42XX8_CHIPID_CHIP_ID_MASK is 0xF0,
> so the chip_id value is (val & CS42XX8_CHIPID_CHIP_ID_MASK) >> 4).
Applied, thanks.
[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
[-- Attachment #2: Type: text/plain, Size: 0 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-04-04 10:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-04-04 3:04 [PATCH v2] ASoC: cs42xx8: Check return value of regmap_read and report correct chipid value Axel Lin
2014-04-04 3:32 ` Nicolin Chen
2014-04-04 10:11 ` Mark Brown
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.