Commit c0e6e7c1 authored by Shawn Bohrer's avatar Shawn Bohrer Committed by Greg Kroah-Hartman
Browse files

staging: line6: Convert simple_strtoul to strict_strtoul in variax.c 



Signed-off-by: default avatarShawn Bohrer <shawn.bohrer@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent bb950a16

drivers/staging/line6/variax.c

+26 −5
Original line number Diff line number Diff line
@@ -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)