diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-11-20 18:47:37 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-29 17:53:37 -0200 |
| commit | 31e0530c32701fc14b845ef84fe61b66e9c5398c (patch) | |
| tree | 51e6433cbcfa9772f69108f2bea9b7102d61ff65 /drivers/media | |
| parent | 3ce6509456805904799bf669e82a8ea5126e92df (diff) | |
| download | talos-obmc-linux-31e0530c32701fc14b845ef84fe61b66e9c5398c.tar.gz talos-obmc-linux-31e0530c32701fc14b845ef84fe61b66e9c5398c.zip | |
V4L/DVB (9676): em28xx: fix a regression caused by 22c90ec6a5e07173ee670dc2ca75e0df0a7772c0
If removing and reiserting the driver on some devices, tuner type will
be unset at the second time. This patch fixes this issue.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/video/em28xx/em28xx-cards.c | 3 |
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) { |
