diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-05-17 12:10:20 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-05-17 12:10:20 -0400 |
| commit | d0dac8082cbc2b234917ec53eb591b1ddbec80bb (patch) | |
| tree | 105651af2db033de4803b91cc029381a1b9b39d2 /drivers/input/keyboard/atkbd.c | |
| parent | bfd68594082d8384781c242aa72a7950b5cf51aa (diff) | |
| parent | ff96b3d4b840e8aa126e0a60fd743417ffdee178 (diff) | |
Merge with linus
Diffstat (limited to 'drivers/input/keyboard/atkbd.c')
| -rw-r--r-- | drivers/input/keyboard/atkbd.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c index ff66ed4ee2cd..79c332f16fc7 100644 --- a/drivers/input/keyboard/atkbd.c +++ b/drivers/input/keyboard/atkbd.c | |||
| @@ -465,8 +465,10 @@ static int atkbd_event(struct input_dev *dev, unsigned int type, unsigned int co | |||
| 465 | if (atkbd->softrepeat) return 0; | 465 | if (atkbd->softrepeat) return 0; |
| 466 | 466 | ||
| 467 | i = j = 0; | 467 | i = j = 0; |
| 468 | while (i < 32 && period[i] < dev->rep[REP_PERIOD]) i++; | 468 | while (i < 31 && period[i] < dev->rep[REP_PERIOD]) |
| 469 | while (j < 4 && delay[j] < dev->rep[REP_DELAY]) j++; | 469 | i++; |
| 470 | while (j < 3 && delay[j] < dev->rep[REP_DELAY]) | ||
| 471 | j++; | ||
| 470 | dev->rep[REP_PERIOD] = period[i]; | 472 | dev->rep[REP_PERIOD] = period[i]; |
| 471 | dev->rep[REP_DELAY] = delay[j]; | 473 | dev->rep[REP_DELAY] = delay[j]; |
| 472 | param[0] = i | (j << 5); | 474 | param[0] = i | (j << 5); |