52 lines
1.6 KiB
Diff
52 lines
1.6 KiB
Diff
From: Andor Daam <andor.daam@googlemail.com>
|
|
Date: Mon, 5 Dec 2011 10:10:37 +0100
|
|
Subject: [009/106] Staging: line6/midi.c: Fixed call of obsolete function
|
|
strict_strtoul
|
|
|
|
commit 251c3948808046c39359658fa2faffff45b825d3 upstream.
|
|
|
|
The obsolete function strict_strtoul should be replaced by the kstrto*
|
|
functions.
|
|
|
|
In this context kstrtou16 should be use, as midi_mask_receive is only
|
|
used as unsigned short. All corresponding datatypes were adapted
|
|
accordingly.
|
|
|
|
Signed-off-by: Andor Daam <andor.daam@googlemail.com>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
|
|
---
|
|
drivers/staging/line6/midi.c | 4 ++--
|
|
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 3d1ada6..3013fb5 100644
|
|
--- a/drivers/staging/line6/midi.c
|
|
+++ b/drivers/staging/line6/midi.c
|
|
@@ -339,10 +339,10 @@ static ssize_t midi_set_midi_mask_receive(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 2c0a663..4a9e9f9 100644
|
|
--- a/drivers/staging/line6/midi.h
|
|
+++ b/drivers/staging/line6/midi.h
|
|
@@ -62,7 +62,7 @@ struct snd_line6_midi {
|
|
/**
|
|
Bit mask for input MIDI channels.
|
|
*/
|
|
- int midi_mask_receive;
|
|
+ unsigned short midi_mask_receive;
|
|
|
|
/**
|
|
Buffer for incoming MIDI stream.
|