diff options
Diffstat (limited to 'drivers/media/video/em28xx/em28xx-input.c')
| -rw-r--r-- | drivers/media/video/em28xx/em28xx-input.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/video/em28xx/em28xx-input.c b/drivers/media/video/em28xx/em28xx-input.c index 8681a793a0bf..e13585898f58 100644 --- a/drivers/media/video/em28xx/em28xx-input.c +++ b/drivers/media/video/em28xx/em28xx-input.c | |||
| @@ -141,8 +141,10 @@ static int get_key_em_haup(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw) | |||
| 141 | /* ----------------------------------------------------------------------- */ | 141 | /* ----------------------------------------------------------------------- */ |
| 142 | void em2820_set_ir(struct em2820 * dev,struct IR_i2c *ir) | 142 | void em2820_set_ir(struct em2820 * dev,struct IR_i2c *ir) |
| 143 | { | 143 | { |
| 144 | if (disable_ir) | 144 | if (disable_ir) { |
| 145 | ir->get_key=NULL; | ||
| 145 | return ; | 146 | return ; |
| 147 | } | ||
| 146 | 148 | ||
| 147 | /* detect & configure */ | 149 | /* detect & configure */ |
| 148 | switch (dev->model) { | 150 | switch (dev->model) { |