From 89ede48724b355a023f0a4420039006a0560ee7c Mon Sep 17 00:00:00 2001
From: Andor Daam <andor.daam@googlemail.com>
Date: Mon, 5 Dec 2011 10:09:25 +0100
Subject: [PATCH] --- yaml --- r: 281298 b: refs/heads/master c:
 4d85fae04f23ebbdbbb11061b8eec48082ecdc43 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/staging/line6/midi.c | 4 ++--
 trunk/drivers/staging/line6/midi.h | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 1713ebd8eed8..73a72bdb26a9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2f30866fbf0dd3b1d5ea87ebab2a96222d1cebe9
+refs/heads/master: 4d85fae04f23ebbdbbb11061b8eec48082ecdc43
diff --git a/trunk/drivers/staging/line6/midi.c b/trunk/drivers/staging/line6/midi.c
index 7f1e90e14411..3d1ada68c29d 100644
--- a/trunk/drivers/staging/line6/midi.c
+++ b/trunk/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/trunk/drivers/staging/line6/midi.h b/trunk/drivers/staging/line6/midi.h
index b73a025d8be9..2c0a66343ca5 100644
--- a/trunk/drivers/staging/line6/midi.h
+++ b/trunk/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.