aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/video/em28xx/em28xx-cards.c4
-rw-r--r--drivers/media/video/em28xx/em28xx-core.c3
2 files changed, 3 insertions, 4 deletions
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index 54429b629b2d..ed281f565945 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -2273,10 +2273,6 @@ void em28xx_card_setup(struct em28xx *dev)
2273 em28xx_gpio_set(dev, dev->board.tuner_gpio); 2273 em28xx_gpio_set(dev, dev->board.tuner_gpio);
2274 em28xx_set_mode(dev, EM28XX_ANALOG_MODE); 2274 em28xx_set_mode(dev, EM28XX_ANALOG_MODE);
2275 break; 2275 break;
2276 case EM2820_BOARD_SILVERCREST_WEBCAM:
2277 /* FIXME: need to document the registers bellow */
2278 em28xx_write_reg(dev, 0x0d, 0x42);
2279 em28xx_write_reg(dev, 0x13, 0x08);
2280 } 2276 }
2281 2277
2282 if (dev->board.has_snapshot_button) 2278 if (dev->board.has_snapshot_button)
diff --git a/drivers/media/video/em28xx/em28xx-core.c b/drivers/media/video/em28xx/em28xx-core.c
index 339fffdf6bce..98e140b5d95e 100644
--- a/drivers/media/video/em28xx/em28xx-core.c
+++ b/drivers/media/video/em28xx/em28xx-core.c
@@ -632,6 +632,9 @@ int em28xx_capture_start(struct em28xx *dev, int start)
632 return rc; 632 return rc;
633 } 633 }
634 634
635 if (dev->board.is_webcam)
636 rc = em28xx_write_reg(dev, 0x13, 0x0c);
637
635 /* enable video capture */ 638 /* enable video capture */
636 rc = em28xx_write_reg(dev, 0x48, 0x00); 639 rc = em28xx_write_reg(dev, 0x48, 0x00);
637 640