Merge branches 'for-3.18/upstream-fixes' and 'for-3.19/upstream' into for-linus

[karo-tx-linux.git] / drivers / hid / hid-input.c

diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index 725f22ca47fcb808401dc08120ad0366bb9d9d69..be3eba8b973117347224acf86c43e5d093ef8a7d 100644 (file)
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@ -872,7 +872,7 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
                case 0x2cb: map_key_clear(KEY_KBDINPUTASSIST_ACCEPT);   break;
                case 0x2cc: map_key_clear(KEY_KBDINPUTASSIST_CANCEL);   break;
 
-               default:    goto ignore;
+               default: map_key_clear(KEY_UNKNOWN);
                }
                break;