diff --git a/[refs] b/[refs]
index 836cf32a480a..7b0c5163d1be 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b3c8aef0a2334e088c21757d3143954c774c6da0
+refs/heads/master: ecd3d0ca4006f86a542bfd5ed1277cac6b2df3be
diff --git a/trunk/drivers/staging/tidspbridge/rmgr/dbdcd.c b/trunk/drivers/staging/tidspbridge/rmgr/dbdcd.c
index cceceb93f673..b96aea77b809 100644
--- a/trunk/drivers/staging/tidspbridge/rmgr/dbdcd.c
+++ b/trunk/drivers/staging/tidspbridge/rmgr/dbdcd.c
@@ -1012,6 +1012,8 @@ static s32 atoi(char *psz_buf)
 {
 	char *pch = psz_buf;
 	s32 base = 0;
+	unsigned long res;
+	int ret_val;
 
 	while (isspace(*pch))
 		pch++;
@@ -1023,7 +1025,9 @@ static s32 atoi(char *psz_buf)
 		base = 16;
 	}
 
-	return simple_strtoul(pch, NULL, base);
+	ret_val = strict_strtoul(pch, base, &res);
+
+	return ret_val ? : res;
 }
 
 /*