← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to drivers/media/video/usbvision/usbvision-video.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/media/video/usbvision/usbvision-video.c
70
70
#include "usbvision.h"
71
71
#include "usbvision-cards.h"
72
72
 
73
 
#define DRIVER_AUTHOR "Joerg Heckenbach <joerg@heckenbach-aw.de>, \
74
 
Dwaine Garden <DwaineGarden@rogers.com>"
 
73
#define DRIVER_AUTHOR                                   \
 
74
        "Joerg Heckenbach <joerg@heckenbach-aw.de>, "   \
 
75
        "Dwaine Garden <DwaineGarden@rogers.com>"
75
76
#define DRIVER_NAME "usbvision"
76
77
#define DRIVER_ALIAS "USBVision"
77
78
#define DRIVER_DESC "USBVision USB Video Device Driver for Linux"
1470
1471
 
1471
1472
        /* This should be here to make i2c clients to be able to register */
1472
1473
        /* first switch off audio */
1473
 
        usbvision_audio_off(usbvision);
 
1474
        if (usbvision_device_data[model].audio_channels > 0)
 
1475
                usbvision_audio_off(usbvision);
1474
1476
        if (!power_on_at_open) {
1475
1477
                /* and then power up the noisy tuner */
1476
1478
                usbvision_power_on(usbvision);