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

iomap: fix coverity errors [1/1]

Browse Source 
PD#SWPL-13972

Problem:
iomap Coverity errors.

Solution:
1. remove verbose code.
2. check return value.

Verify:
test pass on tm2_ab301_v1

Change-Id: Ib8c2baaae63d3c6454ffa45a0c353a6dd9de0787
Signed-off-by: changqing.gao <changqing.gao@amlogic.com>
This commit is contained in:
changqing.gao
2019-09-18 13:41:05 +08:00
committed by Luke Go
parent 617c1d1c5f
commit dd4da0dee8
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/amlogic/iomap/iomap.c
View File

@@ -70,16 +70,20 @@ int aml_regmap_update_bits(u32 bus_type,
unsigned int reg, unsigned int mask,
unsigned int val)
{
if (bus_type < IO_BUS_MAX && (meson_reg_map[bus_type] != NULL)) {
unsigned int tmp, orig;
int ret = 0;
unsigned int tmp, orig;
aml_reg_read(bus_type, reg, &orig);
tmp = orig & ~mask;
tmp |= val & mask;
aml_reg_write(bus_type, reg, tmp);
return 0;
} else
return -1;
ret = aml_reg_read(bus_type, reg, &orig);
if (ret) {
pr_err("read bus reg %x error %d\n", reg, ret);
return ret;
}
tmp = orig & ~mask;
tmp |= val & mask;
ret = aml_reg_write(bus_type, reg, tmp);
if (ret)
pr_err("write bus reg %x error %d\n", reg, ret);
return ret;
}
EXPORT_SYMBOL(aml_regmap_update_bits);