These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / hid / hid-prodikeys.c

diff --git a/kernel/drivers/hid/hid-prodikeys.c b/kernel/drivers/hid/hid-prodikeys.c
index 91fab97..3a207c0 100644 (file)
--- a/kernel/drivers/hid/hid-prodikeys.c
+++ b/kernel/drivers/hid/hid-prodikeys.c
@@ -395,11 +395,10 @@ static int pcmidi_handle_report4(struct pcmidi_snd *pm, u8 *data)
 
        /* break keys */
        for (bit_index = 0; bit_index < 24; bit_index++) {
-               key = pm->last_key[bit_index];
                if (!((0x01 << bit_index) & bit_mask)) {
                        input_event(pm->input_ep82, EV_KEY,
                                pm->last_key[bit_index], 0);
-                               pm->last_key[bit_index] = 0;
+                       pm->last_key[bit_index] = 0;
                }
        }
 
@@ -428,7 +427,7 @@ static int pcmidi_handle_report4(struct pcmidi_snd *pm, u8 *data)
                                        pm->midi_octave = 2;
                                dbg_hid("pcmidi mode: %d octave: %d\n",
                                        pm->midi_mode, pm->midi_octave);
-                           continue;
+                               continue;
                        } else
                                key = KEY_MESSENGER;
                        break;
@@ -696,7 +695,7 @@ static int pcmidi_snd_initialise(struct pcmidi_snd *pm)
        if (err < 0) {
                pk_error("failed to register pc-midi sound card: error %d\n",
                         err);
-                        goto fail_register;
+               goto fail_register;
        }
 
        dbg_hid("pcmidi_snd_initialise finished ok\n");