summaryrefslogtreecommitdiffstats
path: root/drivers/staging/line6
diff options
context:
space:
mode:
authorAndor Daam <andor.daam@googlemail.com>2011-12-05 10:09:25 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2011-12-08 12:32:54 -0800
commit4d85fae04f23ebbdbbb11061b8eec48082ecdc43 (patch)
tree75de5d1cfd207b63ce4329b68e9a783ddd0f2326 /drivers/staging/line6
parent2f30866fbf0dd3b1d5ea87ebab2a96222d1cebe9 (diff)
downloadlinux-4d85fae04f23ebbdbbb11061b8eec48082ecdc43.tar.gz
linux-4d85fae04f23ebbdbbb11061b8eec48082ecdc43.tar.xz
linux-4d85fae04f23ebbdbbb11061b8eec48082ecdc43.zip
Staging: line6/midi.c: Fixed call of obsolete function strict_strtoul
The function strict_strtoul is obsolete and should be replaced by the new kstrto* functions. The variable midi_mask_transmit is only used as unsigned short and the datatypes of all affected variables were adjusted accordingly. Signed-off-by: Andor Daam <andor.daam@googlemail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/line6')
-rw-r--r--drivers/staging/line6/midi.c4
-rw-r--r--drivers/staging/line6/midi.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/line6/midi.c b/drivers/staging/line6/midi.c
index 7f1e90e14411..3d1ada68c29d 100644
--- a/drivers/staging/line6/midi.c
+++ b/drivers/staging/line6/midi.c
@@ -307,10 +307,10 @@ static ssize_t midi_set_midi_mask_transmit(struct device *dev,
{
struct usb_interface *interface = to_usb_interface(dev);
struct usb_line6 *line6 = usb_get_intfdata(interface);
- unsigned long value;
+ unsigned short value;
int ret;
- ret = strict_strtoul(buf, 10, &value);
+ ret = kstrtou16(buf, 10, &value);
if (ret)
return ret;
diff --git a/drivers/staging/line6/midi.h b/drivers/staging/line6/midi.h
index b73a025d8be9..2c0a66343ca5 100644
--- a/drivers/staging/line6/midi.h
+++ b/drivers/staging/line6/midi.h
@@ -57,7 +57,7 @@ struct snd_line6_midi {
/**
Bit mask for output MIDI channels.
*/
- int midi_mask_transmit;
+ unsigned short midi_mask_transmit;
/**
Bit mask for input MIDI channels.