|
@@ -4167,17 +4167,11 @@ static ssize_t show_debug_level(struct device_driver *d, char *buf)
|
|
|
static ssize_t store_debug_level(struct device_driver *d,
|
|
|
const char *buf, size_t count)
|
|
|
{
|
|
|
- char *p = (char *)buf;
|
|
|
u32 val;
|
|
|
+ int ret;
|
|
|
|
|
|
- if (p[1] == 'x' || p[1] == 'X' || p[0] == 'x' || p[0] == 'X') {
|
|
|
- p++;
|
|
|
- if (p[0] == 'x' || p[0] == 'X')
|
|
|
- p++;
|
|
|
- val = simple_strtoul(p, &p, 16);
|
|
|
- } else
|
|
|
- val = simple_strtoul(p, &p, 10);
|
|
|
- if (p == buf)
|
|
|
+ ret = kstrtou32(buf, 0, &val);
|
|
|
+ if (ret)
|
|
|
IPW_DEBUG_INFO(": %s is not in hex or decimal form.\n", buf);
|
|
|
else
|
|
|
ipw2100_debug_level = val;
|
|
@@ -4238,27 +4232,15 @@ static ssize_t store_scan_age(struct device *d, struct device_attribute *attr,
|
|
|
{
|
|
|
struct ipw2100_priv *priv = dev_get_drvdata(d);
|
|
|
struct net_device *dev = priv->net_dev;
|
|
|
- char buffer[] = "00000000";
|
|
|
- unsigned long len =
|
|
|
- (sizeof(buffer) - 1) > count ? count : sizeof(buffer) - 1;
|
|
|
unsigned long val;
|
|
|
- char *p = buffer;
|
|
|
+ int ret;
|
|
|
|
|
|
(void)dev; /* kill unused-var warning for debug-only code */
|
|
|
|
|
|
IPW_DEBUG_INFO("enter\n");
|
|
|
|
|
|
- strncpy(buffer, buf, len);
|
|
|
- buffer[len] = 0;
|
|
|
-
|
|
|
- if (p[1] == 'x' || p[1] == 'X' || p[0] == 'x' || p[0] == 'X') {
|
|
|
- p++;
|
|
|
- if (p[0] == 'x' || p[0] == 'X')
|
|
|
- p++;
|
|
|
- val = simple_strtoul(p, &p, 16);
|
|
|
- } else
|
|
|
- val = simple_strtoul(p, &p, 10);
|
|
|
- if (p == buffer) {
|
|
|
+ ret = kstrtoul(buf, 0, &val);
|
|
|
+ if (ret) {
|
|
|
IPW_DEBUG_INFO("%s: user supplied invalid value.\n", dev->name);
|
|
|
} else {
|
|
|
priv->ieee->scan_age = val;
|
|
@@ -4266,7 +4248,7 @@ static ssize_t store_scan_age(struct device *d, struct device_attribute *attr,
|
|
|
}
|
|
|
|
|
|
IPW_DEBUG_INFO("exit\n");
|
|
|
- return len;
|
|
|
+ return strnlen(buf, count);
|
|
|
}
|
|
|
|
|
|
static DEVICE_ATTR(scan_age, S_IWUSR | S_IRUGO, show_scan_age, store_scan_age);
|