1 files changed, 5 insertions, 3 deletions

diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c
index 6ac5782f4d6b..dbbfb261e62c 100644
--- a/arch/x86/kernel/pci-calgary_64.c
+++ b/arch/x86/kernel/pci-calgary_64.c
@@ -1479,8 +1479,9 @@ cleanup:
 static int __init calgary_parse_options(char *p)
 {
         unsigned int bridge;
+        unsigned long val;
         size_t len;
-        char* endp;
+        ssize_t ret;
 
         while (*p) {
                 if (!strncmp(p, "64k", 3))
@@ -1511,10 +1512,11 @@ static int __init calgary_parse_options(char *p)
                                 ++p;
                         if (*p == '\0')
                                 break;
-                        bridge = simple_strtoul(p, &endp, 0);
-                        if (p == endp)
+                        ret = kstrtoul(p, 0, &val);
+                        if (ret)
                                 break;
 
+                        bridge = val;
                         if (bridge < MAX_PHB_BUS_NUM) {
                                 printk(KERN_INFO "Calgary: disabling "
                                        "translation for PHB %#x\n", bridge);