diff --git a/drivers/input/input.c b/drivers/input/input.c
index 4eadd77..5b2b4b0 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -356,7 +356,8 @@
 		 * insert another character if we later realise that we
 		 * have missed a repeat slot.
 		 */
-		is_repeat = (int)get_timer(config->next_repeat_ms) >= 0;
+		is_repeat = config->repeat_rate_ms &&
+			(int)get_timer(config->next_repeat_ms) >= 0;
 		if (!is_repeat)
 			return 0;
 	}
@@ -392,13 +393,17 @@
 	return 0;
 }
 
-int input_init(struct input_config *config, int leds, int repeat_delay_ms,
+void input_set_delays(struct input_config *config, int repeat_delay_ms,
 	       int repeat_rate_ms)
 {
+	config->repeat_delay_ms = repeat_delay_ms;
+	config->repeat_rate_ms = repeat_rate_ms;
+}
+
+int input_init(struct input_config *config, int leds)
+{
 	memset(config, '\0', sizeof(*config));
 	config->leds = leds;
-	config->repeat_delay_ms = repeat_delay_ms;
-	config->repeat_rate_ms = repeat_rate_ms;
 	if (input_add_table(config, -1, -1,
 			kbd_plain_xlate, ARRAY_SIZE(kbd_plain_xlate)) ||
 		input_add_table(config, KEY_LEFTSHIFT, KEY_RIGHTSHIFT,
diff --git a/drivers/input/tegra-kbc.c b/drivers/input/tegra-kbc.c
index f164791..9a30942 100644
--- a/drivers/input/tegra-kbc.c
+++ b/drivers/input/tegra-kbc.c
@@ -321,6 +321,8 @@
 		debug("%s: No keyboard register found\n", __func__);
 		return -1;
 	}
+	input_set_delays(&config.input, KBC_REPEAT_DELAY_MS,
+			KBC_REPEAT_RATE_MS);
 
 	/* Decode the keyboard matrix information (16 rows, 8 columns) */
 	if (key_matrix_init(&config.matrix, 16, 8)) {
@@ -356,8 +358,7 @@
 {
 	struct stdio_dev dev;
 
-	if (input_init(&config.input, 0, KBC_REPEAT_DELAY_MS,
-			KBC_REPEAT_RATE_MS)) {
+	if (input_init(&config.input, 0)) {
 		debug("%s: Cannot set up input\n", __func__);
 		return -1;
 	}