Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[firefly-linux-kernel-4.4.55.git] / drivers / media / video / usbvision / usbvision-video.c

diff --git a/drivers/media/video/usbvision/usbvision-video.c b/drivers/media/video/usbvision/usbvision-video.c
index 9855fbe5927af0ea90096bba716d060541a1b01b..ea8ea8a48dfe57f7c3b423bef45e3e0055b3267a 100644 (file)
--- a/drivers/media/video/usbvision/usbvision-video.c
+++ b/drivers/media/video/usbvision/usbvision-video.c
@@ -1471,7 +1471,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);