| Message ID | 1396580675.9690.0.camel@phoenix (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 06b4b813058f6092ded5d7e0d92d4c34d92975bd |
| Headers | show |
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 > > > > >
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.
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; }