From: Tomas Winkler <tomas.winkler@xxxxxxxxx>
This has simulated a fault condition of probing for audio capability
Cc: Mike Thomas <rmthomas@xxxxxxxxxxx>
Signed-off-by: Tomas Winkler <tomas.winkler@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
---
drivers/staging/easycap/easycap.h | 1 -
drivers/staging/easycap/easycap_low.c | 8 --------
drivers/staging/easycap/easycap_main.c | 6 ------
3 files changed, 0 insertions(+), 15 deletions(-)
diff --git a/drivers/staging/easycap/easycap.h b/drivers/staging/easycap/easycap.h
index 00669b6..4753d43 100644
--- a/drivers/staging/easycap/easycap.h
+++ b/drivers/staging/easycap/easycap.h
@@ -33,7 +33,6 @@
* EASYCAP_NEEDS_USBVIDEO_H
* EASYCAP_NEEDS_V4L2_DEVICE_H
* EASYCAP_NEEDS_V4L2_FOPS
- * EASYCAP_SILENT
*
* IF REQUIRED THEY MUST BE EXTERNALLY DEFINED, FOR EXAMPLE AS COMPILER
* OPTIONS.
diff --git a/drivers/staging/easycap/easycap_low.c b/drivers/staging/easycap/easycap_low.c
index f3dc1fc..06ccd19 100644
--- a/drivers/staging/easycap/easycap_low.c
+++ b/drivers/staging/easycap/easycap_low.c
@@ -133,11 +133,7 @@ static const struct saa7113config{
int set;
} saa7113configPAL[256] = {
{0x01, 0x08},
-#ifdef ANTIALIAS
- {0x02, 0xC0},
-#else
{0x02, 0x80},
-#endif /*ANTIALIAS*/
{0x03, 0x33},
{0x04, 0x00},
{0x05, 0x00},
@@ -191,11 +187,7 @@ static const struct saa7113config{
/*--------------------------------------------------------------------------*/
static const struct saa7113config saa7113configNTSC[256] = {
{0x01, 0x08},
-#ifdef ANTIALIAS
- {0x02, 0xC0},
-#else
{0x02, 0x80},
-#endif /*ANTIALIAS*/
{0x03, 0x33},
{0x04, 0x00},
{0x05, 0x00},
diff --git a/drivers/staging/easycap/easycap_main.c b/drivers/staging/easycap/easycap_main.c
index 2887f01..997e755 100644
--- a/drivers/staging/easycap/easycap_main.c
+++ b/drivers/staging/easycap/easycap_main.c
@@ -4188,9 +4188,6 @@ static int easycap_usb_probe(struct usb_interface *pusb_interface,
*/
/*--------------------------------------------------------------------------*/
case 1: {
-#ifdef EASYCAP_SILENT
- return -ENOENT;
-#endif /*EASYCAP_SILENT*/
if (!peasycap) {
SAM("MISTAKE: peasycap is NULL\n");
return -EFAULT;
@@ -4207,9 +4204,6 @@ static int easycap_usb_probe(struct usb_interface *pusb_interface,
}
/*--------------------------------------------------------------------------*/
case 2: {
-#ifdef EASYCAP_SILENT
- return -ENOENT;
-#endif /*EASYCAP_SILENT*/
if (!peasycap) {
SAM("MISTAKE: peasycap is NULL\n");
return -EFAULT;
--
1.7.4.1
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
