Skip to content

Commit

Permalink
ASoC: tas6424: Print full register name in error message
Browse files Browse the repository at this point in the history
The current short version of the register name may be
ambiguous when another fault register detection is added.
Use the full name.

While here fix comment about clearing faults, the CLEAR_FAULT
register actually only clears sticky bits, which are only
warnings, fault bits can only cleared by resolving the fault.

Signed-off-by: Andrew F. Davis <afd@ti.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Andrew F. Davis authored and Mark Brown committed Aug 31, 2018
1 parent c2f0898 commit 9198692
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions sound/soc/codecs/tas6424.c
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@ static void tas6424_fault_check_work(struct work_struct *work)

ret = regmap_read(tas6424->regmap, TAS6424_GLOB_FAULT1, &reg);
if (ret < 0) {
dev_err(dev, "failed to read FAULT1 register: %d\n", ret);
dev_err(dev, "failed to read GLOB_FAULT1 register: %d\n", ret);
goto out;
}

Expand Down Expand Up @@ -451,7 +451,7 @@ static void tas6424_fault_check_work(struct work_struct *work)
check_global_fault2_reg:
ret = regmap_read(tas6424->regmap, TAS6424_GLOB_FAULT2, &reg);
if (ret < 0) {
dev_err(dev, "failed to read FAULT2 register: %d\n", ret);
dev_err(dev, "failed to read GLOB_FAULT2 register: %d\n", ret);
goto out;
}

Expand Down Expand Up @@ -524,7 +524,7 @@ static void tas6424_fault_check_work(struct work_struct *work)
/* Store current warn value so we can detect any changes next time */
tas6424->last_warn = reg;

/* Clear any faults by toggling the CLEAR_FAULT control bit */
/* Clear any warnings by toggling the CLEAR_FAULT control bit */
ret = regmap_write_bits(tas6424->regmap, TAS6424_MISC_CTRL3,
TAS6424_CLEAR_FAULT, TAS6424_CLEAR_FAULT);
if (ret < 0)
Expand Down

0 comments on commit 9198692

Please sign in to comment.