diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 18:50:09 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 18:50:09 -0400 |
| commit | 9dfb7808fb05643b0d06df7411b94d9546696bf1 (patch) | |
| tree | aa1a9cc1e79ae66f6cbb0fe39d79a80ca76331e8 /drivers/media/common/ir-common.c | |
| parent | c45154a3b1fecdbb51b5462c9f730b44e62b83a5 (diff) | |
| parent | 20731945ae743034353a88c307920d1f16cf8ac8 (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/media/common/ir-common.c')
| -rw-r--r-- | drivers/media/common/ir-common.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/common/ir-common.c b/drivers/media/common/ir-common.c index a0e700d7a4a4..06f4d4686a6c 100644 --- a/drivers/media/common/ir-common.c +++ b/drivers/media/common/ir-common.c | |||
| @@ -252,7 +252,6 @@ void ir_input_init(struct input_dev *dev, struct ir_input_state *ir, | |||
| 252 | if (ir_codes) | 252 | if (ir_codes) |
| 253 | memcpy(ir->ir_codes, ir_codes, sizeof(ir->ir_codes)); | 253 | memcpy(ir->ir_codes, ir_codes, sizeof(ir->ir_codes)); |
| 254 | 254 | ||
| 255 | init_input_dev(dev); | ||
| 256 | dev->keycode = ir->ir_codes; | 255 | dev->keycode = ir->ir_codes; |
| 257 | dev->keycodesize = sizeof(IR_KEYTAB_TYPE); | 256 | dev->keycodesize = sizeof(IR_KEYTAB_TYPE); |
| 258 | dev->keycodemax = IR_KEYTAB_SIZE; | 257 | dev->keycodemax = IR_KEYTAB_SIZE; |