From: Chase Southwood Date: Sat, 15 Feb 2014 03:59:40 +0000 (-0600) Subject: Staging: comedi: kcomedilib: replace deprecated simple_strtoul() with kstrtouint() X-Git-Tag: v3.15-rc1~139^2~1036 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=e6bed035ca652c43c897731366ea816ea2c4fbf1;p=~emulex%2Finfiniband.git Staging: comedi: kcomedilib: replace deprecated simple_strtoul() with kstrtouint() Since simple_strtoul() has been deprecated, replace it with kstrtouint(). Also, since return code checking for this new function is enforced, add a check to ensure that the conversion has succeeded. Signed-off-by: Chase Southwood Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/kcomedilib/kcomedilib_main.c b/drivers/staging/comedi/kcomedilib/kcomedilib_main.c index 7dc5a18e69d..8777f958c04 100644 --- a/drivers/staging/comedi/kcomedilib/kcomedilib_main.c +++ b/drivers/staging/comedi/kcomedilib/kcomedilib_main.c @@ -41,7 +41,8 @@ struct comedi_device *comedi_open(const char *filename) if (strncmp(filename, "/dev/comedi", 11) != 0) return NULL; - minor = simple_strtoul(filename + 11, NULL, 0); + if (kstrtouint(filename + 11, 0, &minor)) + return NULL; if (minor >= COMEDI_NUM_BOARD_MINORS) return NULL;