shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

audio: fix errors of coverity [1/1]

Browse Source 
PD#166793

Problem:
coverity check errors of format

Solution:
fix err

Verify:
verify locally

Change-Id: Ie3a404fe50c5bdaa6a9cf4a4194659502defdbd2
Signed-off-by: jiejing.wang <jiejing.wang@amlogic.com>
This commit is contained in:
jiejing.wang
2018-10-22 19:05:23 +08:00
committed by Dongjin Kim
parent 5ca16802c9
commit 51d8a9488e
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sound/soc/amlogic/auge/iomap.c
View File

@@ -29,7 +29,7 @@ static void __iomem *aml_snd_reg_map[IO_MAX];
static int aml_snd_read(u32 base_type, unsigned int reg, unsigned int *val)
{
if ((base_type >= IO_PDM_BUS) && (base_type < IO_MAX)) {
if (base_type < IO_MAX) {
*val = readl((aml_snd_reg_map[base_type] + (reg << 2)));
return 0;
@@ -41,7 +41,7 @@ static int aml_snd_read(u32 base_type, unsigned int reg, unsigned int *val)
static void aml_snd_write(u32 base_type, unsigned int reg, unsigned int val)
{
if ((base_type >= IO_PDM_BUS) && (base_type < IO_MAX)) {
if (base_type < IO_MAX) {
writel(val, (aml_snd_reg_map[base_type] + (reg << 2)));
return;
@@ -54,15 +54,16 @@ static void aml_snd_update_bits(u32 base_type,
unsigned int reg, unsigned int mask,
unsigned int val)
{
if ((base_type >= IO_PDM_BUS) && (base_type < IO_MAX)) {
if (base_type < IO_MAX) {
unsigned int tmp, orig;
aml_snd_read(base_type, reg, &orig);
tmp = orig & ~mask;
tmp |= val & mask;
aml_snd_write(base_type, reg, tmp);
if (aml_snd_read(base_type, reg, &orig) == 0) {
tmp = orig & ~mask;
tmp |= val & mask;
aml_snd_write(base_type, reg, tmp);
return;
return;
}
}
pr_err("write snd reg %x error\n", reg);

6
sound/soc/amlogic/meson/meson.c
View File

@@ -683,19 +683,19 @@ static int aml_card_dais_parse_of(struct snd_soc_card *card)
init = NULL;
/* CPU sub-node */
cpu_node = of_parse_phandle(np, "cpu_list", i);
if (cpu_node < 0) {
if (!cpu_node) {
dev_err(dev, "parse aml sound card cpu list error\n");
return -EINVAL;
}
/* CODEC sub-node */
codec_node = of_parse_phandle(np, "codec_list", i);
if (codec_node < 0) {
if (!codec_node) {
dev_err(dev, "parse aml sound card codec list error\n");
return ret;
}
/* Platform sub-node */
plat_node = of_parse_phandle(np, "plat_list", i);
if (plat_node < 0) {
if (!plat_node) {
dev_err(dev,
"parse aml sound card platform list error\n");
return ret;