diff options
-rw-r--r-- | drivers/media/video/Kconfig | 2 | ||||
-rw-r--r-- | drivers/media/video/em28xx/em28xx-video.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig index 29a11c1db1b7..57357db31b8a 100644 --- a/drivers/media/video/Kconfig +++ b/drivers/media/video/Kconfig | |||
@@ -668,7 +668,7 @@ config VIDEO_M32R_AR_M64278 | |||
668 | 668 | ||
669 | config VIDEO_CAFE_CCIC | 669 | config VIDEO_CAFE_CCIC |
670 | tristate "Marvell 88ALP01 (Cafe) CMOS Camera Controller support" | 670 | tristate "Marvell 88ALP01 (Cafe) CMOS Camera Controller support" |
671 | depends on I2C && VIDEO_V4L2 | 671 | depends on PCI && I2C && VIDEO_V4L2 |
672 | select VIDEO_OV7670 | 672 | select VIDEO_OV7670 |
673 | ---help--- | 673 | ---help--- |
674 | This is a video4linux2 driver for the Marvell 88ALP01 integrated | 674 | This is a video4linux2 driver for the Marvell 88ALP01 integrated |
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c index 2a461dde480c..36e72c207a8f 100644 --- a/drivers/media/video/em28xx/em28xx-video.c +++ b/drivers/media/video/em28xx/em28xx-video.c | |||
@@ -1674,9 +1674,9 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev, | |||
1674 | if (dev->has_msp34xx) { | 1674 | if (dev->has_msp34xx) { |
1675 | /* Send a reset to other chips via gpio */ | 1675 | /* Send a reset to other chips via gpio */ |
1676 | em28xx_write_regs_req(dev, 0x00, 0x08, "\xf7", 1); | 1676 | em28xx_write_regs_req(dev, 0x00, 0x08, "\xf7", 1); |
1677 | udelay(2500); | 1677 | msleep(3); |
1678 | em28xx_write_regs_req(dev, 0x00, 0x08, "\xff", 1); | 1678 | em28xx_write_regs_req(dev, 0x00, 0x08, "\xff", 1); |
1679 | udelay(2500); | 1679 | msleep(3); |
1680 | 1680 | ||
1681 | } | 1681 | } |
1682 | video_mux(dev, 0); | 1682 | video_mux(dev, 0); |