diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-01-07 10:47:31 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-01-07 10:47:31 +1100 |
commit | 38edc39e1ae9d7071f99b6964c10c0e4e797f682 (patch) | |
tree | fbc522f1fd0e3ae473e5d6e4c28a12aa5f16e63d /drivers | |
parent | f83ffceb2d53bebbb07842e6f4ea42f2f5cd0e52 (diff) | |
parent | 0c8bf24ff3e4e58273d98dc169538051a3228745 (diff) |
Merge branch 'quilt/staging.current'
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/staging/asus_oled/asus_oled.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/staging/asus_oled/asus_oled.c b/drivers/staging/asus_oled/asus_oled.c index f4c26572c7df..43c57b7688ab 100644 --- a/drivers/staging/asus_oled/asus_oled.c +++ b/drivers/staging/asus_oled/asus_oled.c @@ -194,9 +194,11 @@ static ssize_t set_enabled(struct device *dev, struct device_attribute *attr, { struct usb_interface *intf = to_usb_interface(dev); struct asus_oled_dev *odev = usb_get_intfdata(intf); - int temp = strict_strtoul(buf, 10, NULL); + unsigned long value; + if (strict_strtoul(buf, 10, &value)) + return -EINVAL; - enable_oled(odev, temp); + enable_oled(odev, value); return count; } @@ -207,10 +209,12 @@ static ssize_t class_set_enabled(struct device *device, { struct asus_oled_dev *odev = (struct asus_oled_dev *) dev_get_drvdata(device); + unsigned long value; - int temp = strict_strtoul(buf, 10, NULL); + if (strict_strtoul(buf, 10, &value)) + return -EINVAL; - enable_oled(odev, temp); + enable_oled(odev, value); return count; } |