summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2008-11-20 19:47:37 -0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-11-20 19:47:37 -0200
commit629cb47b4af820e76773eac137150742487afbfb (patch)
treec751b414d931be1b0d5e4aa1dbf4ee2f95f273af /linux/drivers/media/video
parentcf4b37dddc28c17056179e3b7ecb15660952db7e (diff)
downloadmediapointer-dvb-s2-629cb47b4af820e76773eac137150742487afbfb.tar.gz
mediapointer-dvb-s2-629cb47b4af820e76773eac137150742487afbfb.tar.bz2
em28xx: fix a regression caused by changeset 9630
From: Mauro Carvalho Chehab <mchehab@redhat.com> If removing and reiserting the driver on some devices, tuner type will be unset at the second time. This patch fixes this issue. Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video')
-rw-r--r--linux/drivers/media/video/em28xx/em28xx-cards.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/linux/drivers/media/video/em28xx/em28xx-cards.c b/linux/drivers/media/video/em28xx/em28xx-cards.c
index a9ae6ea6e..9177ea54b 100644
--- a/linux/drivers/media/video/em28xx/em28xx-cards.c
+++ b/linux/drivers/media/video/em28xx/em28xx-cards.c
@@ -1806,7 +1806,8 @@ void em28xx_card_setup(struct em28xx *dev)
em28xx_set_model(dev);
dev->tuner_type = em28xx_boards[dev->model].tuner_type;
- dev->tuner_addr = em28xx_boards[dev->model].tuner_addr;
+ if (em28xx_boards[dev->model].tuner_addr)
+ dev->tuner_addr = em28xx_boards[dev->model].tuner_addr;
/* request some modules */
switch (dev->model) {