Skip to content

Commit

Permalink
staging: tidspbridge: Fix atoi to support hexadecimal numbers correctly
Browse files Browse the repository at this point in the history
For some strange reason, the DSP base image node/object properties
description string stores hexadecimal numbers with a 'h' or 'H' suffix
instead of a '0x' prefix. This causes parsing issue because the
dspbridge atoi() implementation relies on strict_strtoul(), which will
return an error because of the trailing 'h' character.

As the atoi() return value is never checked for an error anyway, replace
strict_strtoul() with simple_strtoul() to ignore the suffix.

This fix gets rid of the following assertion failed messages that were
printed when running the dsp-dummy test application.

drivers/staging/tidspbridge/rmgr/nldr.c, line 1691:
Assertion (segid == MEMINTERNALID || segid == MEMEXTERNALID) failed.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Omar Ramirez Luna <omar.ramirez@ti.com>
  • Loading branch information
Laurent Pinchart authored and Omar Ramirez Luna committed Feb 5, 2011
1 parent 57104f0 commit c378204
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions drivers/staging/tidspbridge/rmgr/dbdcd.c
Original file line number Diff line number Diff line change
Expand Up @@ -1020,8 +1020,6 @@ static s32 atoi(char *psz_buf)
{
char *pch = psz_buf;
s32 base = 0;
unsigned long res;
int ret_val;

while (isspace(*pch))
pch++;
Expand All @@ -1033,9 +1031,7 @@ static s32 atoi(char *psz_buf)
base = 16;
}

ret_val = strict_strtoul(pch, base, &res);

return ret_val ? : res;
return simple_strtoul(pch, NULL, base);
}

/*
Expand Down

0 comments on commit c378204

Please sign in to comment.