projects
/
platform
/
kernel
/
kernel-mfld-blackbay.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7b80892
)
V4L/DVB (12495): em28xx: Don't call em28xx_ir_init when disable_ir is true
author
Shine Liu
<shinel@foxmail.com>
Fri, 21 Aug 2009 02:49:26 +0000
(23:49 -0300)
committer
Mauro Carvalho Chehab
<mchehab@redhat.com>
Mon, 31 Aug 2009 05:24:53 +0000
(
02:24
-0300)
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>
drivers/media/video/em28xx/em28xx-cards.c
patch
|
blob
|
history
diff --git
a/drivers/media/video/em28xx/em28xx-cards.c
b/drivers/media/video/em28xx/em28xx-cards.c
index
494560e
..
1c2e544
100644
(file)
--- 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);
}