diff options
| author | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
| commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
| tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /drivers/media/rc/rc-main.c | |
| parent | c0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff) | |
| parent | 96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff) | |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
Diffstat (limited to 'drivers/media/rc/rc-main.c')
| -rw-r--r-- | drivers/media/rc/rc-main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c index 5ac1baf45c8e..f53f9c68d38d 100644 --- a/drivers/media/rc/rc-main.c +++ b/drivers/media/rc/rc-main.c | |||
| @@ -255,7 +255,7 @@ static unsigned int ir_update_mapping(struct rc_dev *dev, | |||
| 255 | * @rc_map: scancode table to be searched | 255 | * @rc_map: scancode table to be searched |
| 256 | * @scancode: the desired scancode | 256 | * @scancode: the desired scancode |
| 257 | * @resize: controls whether we allowed to resize the table to | 257 | * @resize: controls whether we allowed to resize the table to |
| 258 | * accomodate not yet present scancodes | 258 | * accommodate not yet present scancodes |
| 259 | * @return: index of the mapping containing scancode in question | 259 | * @return: index of the mapping containing scancode in question |
| 260 | * or -1U in case of failure. | 260 | * or -1U in case of failure. |
| 261 | * | 261 | * |
| @@ -1037,7 +1037,7 @@ int rc_register_device(struct rc_dev *dev) | |||
| 1037 | goto out_table; | 1037 | goto out_table; |
| 1038 | 1038 | ||
| 1039 | /* | 1039 | /* |
| 1040 | * Default delay of 250ms is too short for some protocols, expecially | 1040 | * Default delay of 250ms is too short for some protocols, especially |
| 1041 | * since the timeout is currently set to 250ms. Increase it to 500ms, | 1041 | * since the timeout is currently set to 250ms. Increase it to 500ms, |
| 1042 | * to avoid wrong repetition of the keycodes. Note that this must be | 1042 | * to avoid wrong repetition of the keycodes. Note that this must be |
| 1043 | * set after the call to input_register_device(). | 1043 | * set after the call to input_register_device(). |