diff options
| author | Shine Liu <shinel@foxmail.com> | 2009-08-21 04:49:26 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-08-31 07:24:53 +0200 |
| commit | f4c5e80faba8ae420d7dc5d9237cc1e0262d7386 (patch) | |
| tree | 16026ca20409d59dc266745e58f427cbd557008a /drivers/media/video/em28xx/em28xx-cards.c | |
| parent | V4L/DVB (12457): zr364: wrong indexes (diff) | |
| download | linux-f4c5e80faba8ae420d7dc5d9237cc1e0262d7386.tar.xz linux-f4c5e80faba8ae420d7dc5d9237cc1e0262d7386.zip | |
V4L/DVB (12495): em28xx: Don't call em28xx_ir_init when disable_ir is true
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>
Diffstat (limited to 'drivers/media/video/em28xx/em28xx-cards.c')
| -rw-r--r-- | drivers/media/video/em28xx/em28xx-cards.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c index 494560e82311..1c2e544eda73 100644 --- a/drivers/media/video/em28xx/em28xx-cards.c +++ b/drivers/media/video/em28xx/em28xx-cards.c @@ -2382,7 +2382,9 @@ void em28xx_card_setup(struct em28xx *dev) } em28xx_tuner_setup(dev); - em28xx_ir_init(dev); + + if(!disable_ir) + em28xx_ir_init(dev); } |