staging: line6: Convert simple_strtoul to strict_strtoul in variax.c
Signed-off-by: Shawn Bohrer <shawn.bohrer@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
bb950a169d
commit
c0e6e7c1b2
1 changed files with 26 additions and 5 deletions
|
@ -184,7 +184,12 @@ static ssize_t variax_set_volume(struct device *dev,
|
||||||
const char *buf, size_t count)
|
const char *buf, size_t count)
|
||||||
{
|
{
|
||||||
struct usb_line6_variax *variax = usb_get_intfdata(to_usb_interface(dev));
|
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,
|
if (line6_transmit_parameter(&variax->line6, VARIAXMIDI_volume,
|
||||||
value) == 0)
|
value) == 0)
|
||||||
|
@ -211,7 +216,12 @@ static ssize_t variax_set_model(struct device *dev,
|
||||||
const char *buf, size_t count)
|
const char *buf, size_t count)
|
||||||
{
|
{
|
||||||
struct usb_line6_variax *variax = usb_get_intfdata(to_usb_interface(dev));
|
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)
|
if (line6_send_program(&variax->line6, value) == 0)
|
||||||
variax->model = value;
|
variax->model = value;
|
||||||
|
@ -237,8 +247,14 @@ static ssize_t variax_set_active(struct device *dev,
|
||||||
const char *buf, size_t count)
|
const char *buf, size_t count)
|
||||||
{
|
{
|
||||||
struct usb_line6_variax *variax = usb_get_intfdata(to_usb_interface(dev));
|
struct usb_line6_variax *variax = usb_get_intfdata(to_usb_interface(dev));
|
||||||
int value = simple_strtoul(buf, NULL, 10) ? 1 : 0;
|
unsigned long value;
|
||||||
variax->buffer_activate[VARIAX_OFFSET_ACTIVATE] = 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,
|
line6_send_raw_message_async(&variax->line6, variax->buffer_activate,
|
||||||
sizeof(variax_activate));
|
sizeof(variax_activate));
|
||||||
return count;
|
return count;
|
||||||
|
@ -262,7 +278,12 @@ static ssize_t variax_set_tone(struct device *dev,
|
||||||
const char *buf, size_t count)
|
const char *buf, size_t count)
|
||||||
{
|
{
|
||||||
struct usb_line6_variax *variax = usb_get_intfdata(to_usb_interface(dev));
|
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,
|
if (line6_transmit_parameter(&variax->line6, VARIAXMIDI_tone,
|
||||||
value) == 0)
|
value) == 0)
|
||||||
|
|
Loading…
Add table
Reference in a new issue