diff options
| author | Andor Daam | 2011-12-05 10:09:25 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2011-12-08 12:32:54 -0800 |
| commit | 4d85fae04f23ebbdbbb11061b8eec48082ecdc43 (patch) | |
| tree | 75de5d1cfd207b63ce4329b68e9a783ddd0f2326 | |
| parent | 2f30866fbf0dd3b1d5ea87ebab2a96222d1cebe9 (diff) | |
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>
| -rw-r--r-- | drivers/staging/line6/midi.c | 4 | ||||
| -rw-r--r-- | drivers/staging/line6/midi.h | 2 |
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. |