summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>2016-09-25 22:00:20 +0900
committerJiri Slaby <jslaby@suse.cz>2016-10-17 09:46:19 +0200
commit841abffa182dfd9f19e3420037b3edad18916f9c (patch)
tree76b6e7a0ef1b652c693fcca41e8860fb6e896b56
parentb3b34980847468b6bb0b26b3909e514a1c47d383 (diff)
downloadlinux-stable-841abffa182dfd9f19e3420037b3edad18916f9c.tar.gz
linux-stable-841abffa182dfd9f19e3420037b3edad18916f9c.tar.bz2
linux-stable-841abffa182dfd9f19e3420037b3edad18916f9c.zip
ALSA: usb-line6: use the same declaration as definition in header for MIDI manufacturer ID
commit 8da08ca03b73593d5299893bf29fc08569c3fb5f upstream. Currently, usb-line6 module exports an array of MIDI manufacturer ID and usb-pod module uses it. However, the declaration is not the definition in common header. The difference is explicit length of array. Although compiler calculates it and everything goes well, it's better to use the same representation between definition and declaration. This commit fills the length of array for usb-line6 module. As a small good sub-effect, this commit suppress below warnings from static analysis by sparse v0.5.0. sound/usb/line6/driver.c:274:43: error: cannot size expression sound/usb/line6/driver.c:275:16: error: cannot size expression sound/usb/line6/driver.c:276:16: error: cannot size expression sound/usb/line6/driver.c:277:16: error: cannot size expression Fixes: 705ececd1c60 ("Staging: add line6 usb driver") Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jiri Slaby <jslaby@suse.cz>
-rw-r--r--drivers/staging/line6/driver.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/line6/driver.c b/drivers/staging/line6/driver.c
index 471c10c116ec..368f9915d815 100644
--- a/drivers/staging/line6/driver.c
+++ b/drivers/staging/line6/driver.c
@@ -83,7 +83,7 @@ static struct line6_properties line6_properties_table[] = {
/*
This is Line6's MIDI manufacturer ID.
*/
-const unsigned char line6_midi_id[] = {
+const unsigned char line6_midi_id[3] = {
0x00, 0x01, 0x0c
};