leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging/easycap: remove EASYCAP_SILENT option

Browse Source 
This has simulated a fault condition of probing for audio capability

Cc: Mike Thomas <rmthomas@sciolus.org>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Tomas Winkler 2011-02-09 01:12:46 +02:00 committed by Greg Kroah-Hartman
parent 6ae2dbec4d
commit a78392aa34
3 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/staging/easycap/easycap.h
View File

@ -33,7 +33,6 @@
* EASYCAP_NEEDS_USBVIDEO_H * EASYCAP_NEEDS_USBVIDEO_H
* EASYCAP_NEEDS_V4L2_DEVICE_H * EASYCAP_NEEDS_V4L2_DEVICE_H
* EASYCAP_NEEDS_V4L2_FOPS * EASYCAP_NEEDS_V4L2_FOPS
* EASYCAP_SILENT
* *
* IF REQUIRED THEY MUST BE EXTERNALLY DEFINED, FOR EXAMPLE AS COMPILER * IF REQUIRED THEY MUST BE EXTERNALLY DEFINED, FOR EXAMPLE AS COMPILER
* OPTIONS. * OPTIONS.

8
drivers/staging/easycap/easycap_low.c
View File

@ -133,11 +133,7 @@ static const struct saa7113config{
int set; int set;
} saa7113configPAL[256] = { } saa7113configPAL[256] = {
{0x01, 0x08}, {0x01, 0x08},
#ifdef ANTIALIAS
{0x02, 0xC0},
#else
{0x02, 0x80}, {0x02, 0x80},
#endif /*ANTIALIAS*/
{0x03, 0x33}, {0x03, 0x33},
{0x04, 0x00}, {0x04, 0x00},
{0x05, 0x00}, {0x05, 0x00},
@ -191,11 +187,7 @@ static const struct saa7113config{
/*--------------------------------------------------------------------------*/ /*--------------------------------------------------------------------------*/
static const struct saa7113config saa7113configNTSC[256] = { static const struct saa7113config saa7113configNTSC[256] = {
{0x01, 0x08}, {0x01, 0x08},
#ifdef ANTIALIAS
{0x02, 0xC0},
#else
{0x02, 0x80}, {0x02, 0x80},
#endif /*ANTIALIAS*/
{0x03, 0x33}, {0x03, 0x33},
{0x04, 0x00}, {0x04, 0x00},
{0x05, 0x00}, {0x05, 0x00},

6
drivers/staging/easycap/easycap_main.c
View File

@ -4188,9 +4188,6 @@ static int easycap_usb_probe(struct usb_interface *pusb_interface,
*/ */
/*--------------------------------------------------------------------------*/ /*--------------------------------------------------------------------------*/
case 1: { case 1: {
#ifdef EASYCAP_SILENT
return -ENOENT;
#endif /*EASYCAP_SILENT*/
if (!peasycap) { if (!peasycap) {
SAM("MISTAKE: peasycap is NULL\n"); SAM("MISTAKE: peasycap is NULL\n");
return -EFAULT; return -EFAULT;
@ -4207,9 +4204,6 @@ static int easycap_usb_probe(struct usb_interface *pusb_interface,
} }
/*--------------------------------------------------------------------------*/ /*--------------------------------------------------------------------------*/
case 2: { case 2: {
#ifdef EASYCAP_SILENT
return -ENOENT;
#endif /*EASYCAP_SILENT*/
if (!peasycap) { if (!peasycap) {
SAM("MISTAKE: peasycap is NULL\n"); SAM("MISTAKE: peasycap is NULL\n");
return -EFAULT; return -EFAULT;