git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob

   1 From 8da08ca03b73593d5299893bf29fc08569c3fb5f Mon Sep 17 00:00:00 2001
   2 From: Takashi Sakamoto <o-takashi@sakamocchi.jp>
   3 Date: Sun, 25 Sep 2016 22:00:20 +0900
   4 Subject: ALSA: usb-line6: use the same declaration as definition in header for MIDI manufacturer ID
   5
   6 From: Takashi Sakamoto <o-takashi@sakamocchi.jp>
   7
   8 commit 8da08ca03b73593d5299893bf29fc08569c3fb5f upstream.
   9
  10 Currently, usb-line6 module exports an array of MIDI manufacturer ID and
  11 usb-pod module uses it. However, the declaration is not the definition in
  12 common header. The difference is explicit length of array. Although
  13 compiler calculates it and everything goes well, it's better to use the
  14 same representation between definition and declaration.
  15
  16 This commit fills the length of array for usb-line6 module. As a small
  17 good sub-effect, this commit suppress below warnings from static analysis
  18 by sparse v0.5.0.
  19
  20 sound/usb/line6/driver.c:274:43: error: cannot size expression
  21 sound/usb/line6/driver.c:275:16: error: cannot size expression
  22 sound/usb/line6/driver.c:276:16: error: cannot size expression
  23 sound/usb/line6/driver.c:277:16: error: cannot size expression
  24
  25 Fixes: 705ececd1c60 ("Staging: add line6 usb driver")
  26 Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
  27 Signed-off-by: Takashi Iwai <tiwai@suse.de>
  28 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  29
  30 ---
  31  sound/usb/line6/driver.c |    2 +-
  32  1 file changed, 1 insertion(+), 1 deletion(-)
  33
  34 --- a/sound/usb/line6/driver.c
  35 +++ b/sound/usb/line6/driver.c
  36 @@ -29,7 +29,7 @@
  37  /*
  38         This is Line 6's MIDI manufacturer ID.
  39  */
  40 -const unsigned char line6_midi_id[] = {
  41 +const unsigned char line6_midi_id[3] = {
  42         0x00, 0x01, 0x0c
  43  };
  44  EXPORT_SYMBOL_GPL(line6_midi_id);