diff options
| author | Ondrej Zary <linux@rainbow-software.org> | 2011-04-27 17:36:05 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-05-20 09:29:29 -0300 |
| commit | 240d57bb8238d6998644c7f696c27076956ff653 (patch) | |
| tree | eada3a282c50d4209ee76d7ef92f4748a1d11174 /drivers/media/video/usbvision/usbvision-video.c | |
| parent | 449a0bada34e5e554ef52aca86aeaa81ed35533e (diff) | |
| download | talos-obmc-linux-240d57bb8238d6998644c7f696c27076956ff653.tar.gz talos-obmc-linux-240d57bb8238d6998644c7f696c27076956ff653.zip | |
[media] usbvision: add Nogatech USB MicroCam
Add Nogatech USB MicroCam PAL (NV3001P) and NTSC (NV3000N) support to
usbvision driver.
PAL version is tested, NTSC untested.
Data captured using usbsnoop, init_values are listed in the INF file along
with image dimensions, offsets and frame rates.
Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/usbvision/usbvision-video.c')
| -rw-r--r-- | drivers/media/video/usbvision/usbvision-video.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/video/usbvision/usbvision-video.c b/drivers/media/video/usbvision/usbvision-video.c index 6083137f0bf8..711cd997e21c 100644 --- a/drivers/media/video/usbvision/usbvision-video.c +++ b/drivers/media/video/usbvision/usbvision-video.c @@ -1470,7 +1470,8 @@ static void usbvision_configure_video(struct usb_usbvision *usbvision) /* This should be here to make i2c clients to be able to register */ /* first switch off audio */ - usbvision_audio_off(usbvision); + if (usbvision_device_data[model].audio_channels > 0) + usbvision_audio_off(usbvision); if (!power_on_at_open) { /* and then power up the noisy tuner */ usbvision_power_on(usbvision); |
