sven
/
can-utils
mirror of https://github.com/linux-can/can-utils.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mcp251xfd-dump: regmap: skip lines that cannot be read

pull/395/head
Marc Kleine-Budde 2023-01-03 13:08:00 +01:00
parent 088176e4e0
commit ceb9761544
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mcp251xfd/mcp251xfd-regmap.c
View File

@ -2,7 +2,7 @@
// //
// Microchip MCP251xFD Family CAN controller debug tool // Microchip MCP251xFD Family CAN controller debug tool
// //
// Copyright (c) 2020, 2022 Pengutronix, // Copyright (c) 2020, 2022, 2023 Pengutronix,
// Marc Kleine-Budde <kernel@pengutronix.de> // Marc Kleine-Budde <kernel@pengutronix.de>
// //
@ -27,13 +27,18 @@ do_mcp251xfd_regmap_read(struct mcp251xfd_priv *priv,
uint16_t reg; uint16_t reg;
uint32_t val; uint32_t val;
unsigned int n = 0; unsigned int n = 0;
int err = 0; int ret, err = 0;
reg_file = fopen(file_path, "r"); reg_file = fopen(file_path, "r");
if (!reg_file) if (!reg_file)
return -errno; return -errno;
while (fscanf(reg_file, "%hx: %x\n", &reg, &val) == 2) { while ((ret = fscanf(reg_file, "%hx: %x\n", &reg, &val)) != EOF) {
if (ret != 2) {
fscanf(reg_file, "%*[^\n]\n");
continue;
}
if (reg >= ARRAY_SIZE(mem->buf)) { if (reg >= ARRAY_SIZE(mem->buf)) {
err = -EINVAL; err = -EINVAL;
goto out_close; goto out_close;