diff options
| author |   Johannes Berg <johannes.berg@intel.com> | 2014-02-20 11:55:12 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2014-02-20 11:55:12 +0100 |
| commit | bf5f48339a019c9b4b42284c3f45d58942cbda27 (patch) | |
| tree | 79976135166ffbdaf4ccb91bcadb17ddb551f060 /lib/dynamic_debug.c | |
| parent | mac80211: remove erroneous comment about RX radiotap header (diff) | |
| parent | Staging: rtl8812ae: remove modules field of rate_control_ops (diff) | |
| download | linux-dev-bf5f48339a019c9b4b42284c3f45d58942cbda27.tar.xz linux-dev-bf5f48339a019c9b4b42284c3f45d58942cbda27.zip | |
Merge remote-tracking branch 'wireless-next/master' into mac80211-next
Diffstat (limited to 'lib/dynamic_debug.c')
| -rw-r--r-- | lib/dynamic_debug.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c index 600ac57e2777..7288e38e1757 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c @@ -268,14 +268,12 @@ static int ddebug_tokenize(char *buf, char *words[], int maxwords) */ static inline int parse_lineno(const char *str, unsigned int *val) { - char *end = NULL; BUG_ON(str == NULL); if (*str == '\0') { *val = 0; return 0; } - *val = simple_strtoul(str, &end, 10); - if (end == NULL || end == str || *end != '\0') { + if (kstrtouint(str, 10, val) < 0) { pr_err("bad line-number: %s\n", str); return -EINVAL; } @@ -348,14 +346,14 @@ static int ddebug_parse_query(char *words[], int nwords, } if (last) *last++ = '\0'; - if (parse_lineno(first, &query->first_lineno) < 0) { - pr_err("line-number is <0\n"); + if (parse_lineno(first, &query->first_lineno) < 0) return -EINVAL; - } if (last) { /* range <first>-<last> */ - if (parse_lineno(last, &query->last_lineno) - < query->first_lineno) { + if (parse_lineno(last, &query->last_lineno) < 0) + return -EINVAL; + + if (query->last_lineno < query->first_lineno) { pr_err("last-line:%d < 1st-line:%d\n", query->last_lineno, query->first_lineno); |