]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Staging: line6/midi.c: Fixed call of obsolete function strict_strtoul
authorAndor Daam <andor.daam@googlemail.com>
Mon, 5 Dec 2011 09:09:25 +0000 (10:09 +0100)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 8 Dec 2011 20:32:54 +0000 (12:32 -0800)
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>
drivers/staging/line6/midi.c
drivers/staging/line6/midi.h

index 7f1e90e14411e85b35c88d0fb35fc90cb2610614..3d1ada68c29da02cffbb8850708b1f55f484bb73 100644 (file)
@@ -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;
 
index b73a025d8be922976d045e7cebc0bcdee29a1636..2c0a66343ca5101feb89385fb4945da8c20d61c3 100644 (file)
@@ -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.