diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-08-21 02:49:26 +0000 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-08-21 02:49:26 +0000 |
| commit | 55978f5ebca02a1b6f03e130bdcd5b6957004025 (patch) | |
| tree | 5641718de5b904a89cd3257638d097cdbb679ffb | |
| parent | 5d99eef4034c0c6059afabdccea5620e96e935e5 (diff) | |
| download | mediapointer-dvb-s2-55978f5ebca02a1b6f03e130bdcd5b6957004025.tar.gz mediapointer-dvb-s2-55978f5ebca02a1b6f03e130bdcd5b6957004025.tar.bz2 | |
em28xx: Don't call em28xx_ir_init when disable_ir is true
From: Shine Liu <shinel@foxmail.com>
We should call em28xx_ir_init(dev) only when disable_ir is true.
Signed-off-by: Shine Liu <shinel@foxmail.com>
Reviewed-by: Devin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| -rw-r--r-- | linux/drivers/media/video/em28xx/em28xx-cards.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/linux/drivers/media/video/em28xx/em28xx-cards.c b/linux/drivers/media/video/em28xx/em28xx-cards.c index b8778577d..36bcaad4c 100644 --- a/linux/drivers/media/video/em28xx/em28xx-cards.c +++ b/linux/drivers/media/video/em28xx/em28xx-cards.c @@ -2498,7 +2498,9 @@ void em28xx_card_setup(struct em28xx *dev) } em28xx_tuner_setup(dev); - em28xx_ir_init(dev); + + if(!disable_ir) + em28xx_ir_init(dev); } |