aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Sakamoto2016-09-25 08:00:20 -0500
committerGreg Kroah-Hartman2016-10-16 10:36:14 -0500
commita2afa5f1a3c9b1226451ae05440a2dd344cf34f8 (patch)
treef6bbc190e78b93cc1006ddd0bd4fdcb82ab0d802
parentc143a28cb65cfd43219327a5bc2bed083cd972eb (diff)
downloadgraphics-kernel-feature-tree-a2afa5f1a3c9b1226451ae05440a2dd344cf34f8.tar.gz
graphics-kernel-feature-tree-a2afa5f1a3c9b1226451ae05440a2dd344cf34f8.tar.xz
graphics-kernel-feature-tree-a2afa5f1a3c9b1226451ae05440a2dd344cf34f8.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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--sound/usb/line6/driver.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/usb/line6/driver.c b/sound/usb/line6/driver.c
index 81b7da8e56d3..183311cb849e 100644
--- a/sound/usb/line6/driver.c
+++ b/sound/usb/line6/driver.c
@@ -29,7 +29,7 @@
29/* 29/*
30 This is Line 6's MIDI manufacturer ID. 30 This is Line 6's MIDI manufacturer ID.
31*/ 31*/
32const unsigned char line6_midi_id[] = { 32const unsigned char line6_midi_id[3] = {
33 0x00, 0x01, 0x0c 33 0x00, 0x01, 0x0c
34}; 34};
35EXPORT_SYMBOL_GPL(line6_midi_id); 35EXPORT_SYMBOL_GPL(line6_midi_id);