diff options
| author | Jody McIntyre <scjody@modernduck.com> | 2005-12-12 23:34:32 -0500 |
|---|---|---|
| committer | Jody McIntyre <scjody@modernduck.com> | 2005-12-12 23:34:32 -0500 |
| commit | 525352eb6d355bef6adf597252fc6d04f2dbe66c (patch) | |
| tree | 4d2b42372ec0ac985f2775b0ea260c707e93fdd4 /drivers/media/common/ir-common.c | |
| parent | d51e86c18a479f1dbcef3aa20e58ad04d1233016 (diff) | |
| parent | 0e670506668a43e1355b8f10c33d081a676bd521 (diff) | |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/media/common/ir-common.c')
| -rw-r--r-- | drivers/media/common/ir-common.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/common/ir-common.c b/drivers/media/common/ir-common.c index 7972c73bc14e..97fa3fc571c4 100644 --- a/drivers/media/common/ir-common.c +++ b/drivers/media/common/ir-common.c | |||
| @@ -313,6 +313,7 @@ void ir_input_init(struct input_dev *dev, struct ir_input_state *ir, | |||
| 313 | if (ir_codes) | 313 | if (ir_codes) |
| 314 | memcpy(ir->ir_codes, ir_codes, sizeof(ir->ir_codes)); | 314 | memcpy(ir->ir_codes, ir_codes, sizeof(ir->ir_codes)); |
| 315 | 315 | ||
| 316 | |||
| 316 | dev->keycode = ir->ir_codes; | 317 | dev->keycode = ir->ir_codes; |
| 317 | dev->keycodesize = sizeof(IR_KEYTAB_TYPE); | 318 | dev->keycodesize = sizeof(IR_KEYTAB_TYPE); |
| 318 | dev->keycodemax = IR_KEYTAB_SIZE; | 319 | dev->keycodemax = IR_KEYTAB_SIZE; |