1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index e7d69d6ef566..5751b66564f4 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -1801,7 +1801,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) {