ASoC: cs42xx8: Check return value of regmap_read and report correct chipid value
diff mbox

Message ID 1396511616.30532.2.camel@phoenix
State New, archived
Headers show

Commit Message

Axel Lin April 3, 2014, 7:53 a.m. UTC
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>
---
 sound/soc/codecs/cs42xx8.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

Comments

Nicolin Chen April 3, 2014, 3:33 p.m. UTC | #1
On Thu, Apr 03, 2014 at 03:53:36PM +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>
> ---
>  sound/soc/codecs/cs42xx8.c | 9 ++++-----
>  1 file changed, 4 insertions(+), 5 deletions(-)
> 
> diff --git a/sound/soc/codecs/cs42xx8.c b/sound/soc/codecs/cs42xx8.c
> index 082299a..b1606cf 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) {
> +	ret = regmap_read(cs42xx8->regmap, CS42XX8_CHIPID, &val);
> +	if (ret < 0) {
>  		dev_err(dev, "failed to get device ID: %x", val);

%d and ret would be better here since val won't be useful in this case.

Thank you for the fix.
Nicolin Chen

> -		ret = -EINVAL;
>  		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
> 
> 
> 
> 
>
Paul Handrigan April 3, 2014, 4:48 p.m. UTC | #2
Acked-by: Paul Handrigan <paul.handrigan@cirrus.com>

On Thu, 3 Apr 2014, Nicolin Chen wrote:

> On Thu, Apr 03, 2014 at 03:53:36PM +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>
>> ---
>>  sound/soc/codecs/cs42xx8.c | 9 ++++-----
>>  1 file changed, 4 insertions(+), 5 deletions(-)
>>
>> diff --git a/sound/soc/codecs/cs42xx8.c b/sound/soc/codecs/cs42xx8.c
>> index 082299a..b1606cf 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) {
>> +	ret = regmap_read(cs42xx8->regmap, CS42XX8_CHIPID, &val);
>> +	if (ret < 0) {
>>  		dev_err(dev, "failed to get device ID: %x", val);
>
> %d and ret would be better here since val won't be useful in this case.
>
> Thank you for the fix.
> Nicolin Chen
>
>> -		ret = -EINVAL;
>>  		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
>>
>>
>>
>>
>>
>
>
Austin, Brian April 3, 2014, 4:50 p.m. UTC | #3
> 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: Brian Austin <brian.austin@cirrus.com>
Mark Brown April 3, 2014, 9:33 p.m. UTC | #4
On Thu, Apr 03, 2014 at 11:33:15PM +0800, Nicolin Chen wrote:
> On Thu, Apr 03, 2014 at 03:53:36PM +0800, Axel Lin wrote:

> > +	ret = regmap_read(cs42xx8->regmap, CS42XX8_CHIPID, &val);
> > +	if (ret < 0) {
> >  		dev_err(dev, "failed to get device ID: %x", val);

> %d and ret would be better here since val won't be useful in this case.

Yes, they would - val won't have anything in particular in it if the I/O
fails.

Patch
diff mbox

diff --git a/sound/soc/codecs/cs42xx8.c b/sound/soc/codecs/cs42xx8.c
index 082299a..b1606cf 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) {
+	ret = regmap_read(cs42xx8->regmap, CS42XX8_CHIPID, &val);
+	if (ret < 0) {
 		dev_err(dev, "failed to get device ID: %x", val);
-		ret = -EINVAL;
 		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;
 	}