diff --git a/[refs] b/[refs]
index 73a72bdb26a9..914c980b6876 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4d85fae04f23ebbdbbb11061b8eec48082ecdc43
+refs/heads/master: 251c3948808046c39359658fa2faffff45b825d3
diff --git a/trunk/drivers/staging/line6/midi.c b/trunk/drivers/staging/line6/midi.c
index 3d1ada68c29d..3013fb522bde 100644
--- a/trunk/drivers/staging/line6/midi.c
+++ b/trunk/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/trunk/drivers/staging/line6/midi.h b/trunk/drivers/staging/line6/midi.h
index 2c0a66343ca5..4a9e9f947297 100644
--- a/trunk/drivers/staging/line6/midi.h
+++ b/trunk/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.