diff --git a/[refs] b/[refs]
index e871b406498a..eff8eda52113 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 57104f0fbe5bb35694eb470530850a71ef2f8063
+refs/heads/master: c378204afacc627330a9a1aeb5b5cd6e3d821717
diff --git a/trunk/drivers/staging/tidspbridge/rmgr/dbdcd.c b/trunk/drivers/staging/tidspbridge/rmgr/dbdcd.c
index 3581a55ed4dd..b76f26caeab2 100644
--- a/trunk/drivers/staging/tidspbridge/rmgr/dbdcd.c
+++ b/trunk/drivers/staging/tidspbridge/rmgr/dbdcd.c
@@ -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++;
@@ -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);
 }
 
 /*