staging: line6: Convert simple_strtoul to strict_strtoul in variax.c
authorShawn Bohrer <shawn.bohrer@gmail.com>
Mon, 16 Nov 2009 04:18:00 +0000 (22:18 -0600)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 11 Dec 2009 20:21:47 +0000 (12:21 -0800)
Signed-off-by: Shawn Bohrer <shawn.bohrer@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/line6/variax.c

index f9d96984733a8b71aa116d0895037968e3d0c457..48d834b0fa1b3044cb74d4294e5c3790177e37fc 100644 (file)
@@ -184,7 +184,12 @@ static ssize_t variax_set_volume(struct device *dev,
                                 const char *buf, size_t count)
 {
        struct usb_line6_variax *variax = usb_get_intfdata(to_usb_interface(dev));
-       int value = simple_strtoul(buf, NULL, 10);
+       unsigned long value;
+       int ret;
+
+       ret = strict_strtoul(buf, 10, &value);
+       if (ret)
+               return ret;
 
        if (line6_transmit_parameter(&variax->line6, VARIAXMIDI_volume,
                                     value) == 0)
@@ -211,7 +216,12 @@ static ssize_t variax_set_model(struct device *dev,
                                const char *buf, size_t count)
 {
        struct usb_line6_variax *variax = usb_get_intfdata(to_usb_interface(dev));
-       int value = simple_strtoul(buf, NULL, 10);
+       unsigned long value;
+       int ret;
+
+       ret = strict_strtoul(buf, 10, &value);
+       if (ret)
+               return ret;
 
        if (line6_send_program(&variax->line6, value) == 0)
                variax->model = value;
@@ -237,8 +247,14 @@ static ssize_t variax_set_active(struct device *dev,
                                 const char *buf, size_t count)
 {
        struct usb_line6_variax *variax = usb_get_intfdata(to_usb_interface(dev));
-       int value = simple_strtoul(buf, NULL, 10) ? 1 : 0;
-       variax->buffer_activate[VARIAX_OFFSET_ACTIVATE] = value;
+       unsigned long value;
+       int ret;
+
+       ret = strict_strtoul(buf, 10, &value);
+       if (ret)
+               return ret;
+
+       variax->buffer_activate[VARIAX_OFFSET_ACTIVATE] = value ? 1: 0;
        line6_send_raw_message_async(&variax->line6, variax->buffer_activate,
                                     sizeof(variax_activate));
        return count;
@@ -262,7 +278,12 @@ static ssize_t variax_set_tone(struct device *dev,
                               const char *buf, size_t count)
 {
        struct usb_line6_variax *variax = usb_get_intfdata(to_usb_interface(dev));
-       int value = simple_strtoul(buf, NULL, 10);
+       unsigned long value;
+       int ret;
+
+       ret = strict_strtoul(buf, 10, &value);
+       if (ret)
+               return ret;
 
        if (line6_transmit_parameter(&variax->line6, VARIAXMIDI_tone,
                                     value) == 0)