From 39612600611189e81be0927deed758a9ccb234d6 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Sun, 26 Oct 2003 19:52:49 -0800 Subject: [PATCH] Don't force PS/2 mouse rate or resolution by default. Only set the rate/resolution if the user actually asked for it. Some mice and KVM switches don't like to have their rate forced. --- drivers/input/mouse/psmouse-base.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c index 13550cd4719f5..2da83a4f8b250 100644 --- a/drivers/input/mouse/psmouse-base.c +++ b/drivers/input/mouse/psmouse-base.c @@ -40,7 +40,7 @@ MODULE_LICENSE("GPL"); static int psmouse_noext; int psmouse_resolution; -unsigned int psmouse_rate = 60; +unsigned int psmouse_rate; int psmouse_smartscroll = PSMOUSE_LOGITECH_SMARTSCROLL; unsigned int psmouse_resetafter; @@ -471,13 +471,16 @@ static void psmouse_initialize(struct psmouse *psmouse) * We set the mouse report rate. */ - psmouse_set_rate(psmouse); + if (psmouse_rate) + psmouse_set_rate(psmouse); /* * We also set the resolution and scaling. */ - psmouse_set_resolution(psmouse); + if (psmouse_resolution) + psmouse_set_resolution(psmouse); + psmouse_command(psmouse, NULL, PSMOUSE_CMD_SETSCALE11); /* @@ -651,10 +654,17 @@ static int __init psmouse_resetafter_setup(char *str) return 1; } +static int __init psmouse_rate_setup(char *str) +{ + get_option(&str, &psmouse_rate); + return 1; +} + __setup("psmouse_noext", psmouse_noext_setup); __setup("psmouse_resolution=", psmouse_resolution_setup); __setup("psmouse_smartscroll=", psmouse_smartscroll_setup); __setup("psmouse_resetafter=", psmouse_resetafter_setup); +__setup("psmouse_rate=", psmouse_rate_setup); #endif -- 2.53.0