lkml.org 
[lkml]   [2009]   [Nov]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 11/13] staging: line6: Convert simple_strtoul to strict_strtoul in variax.c
    Date
    Signed-off-by: Shawn Bohrer <shawn.bohrer@gmail.com>
    ---
    drivers/staging/line6/variax.c | 31 ++++++++++++++++++++++++++-----
    1 files changed, 26 insertions(+), 5 deletions(-)

    diff --git a/drivers/staging/line6/variax.c b/drivers/staging/line6/variax.c
    index f9d9698..48d834b 100644
    --- a/drivers/staging/line6/variax.c
    +++ b/drivers/staging/line6/variax.c
    @@ -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)
    --
    1.6.5


    \
     
     \ /
      Last update: 2009-11-16 05:21    [W:0.021 / U:62.288 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site