Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a78392aa authored by Tomas Winkler's avatar Tomas Winkler Committed by Greg Kroah-Hartman
Browse files

staging/easycap: remove EASYCAP_SILENT option 



This has simulated a fault condition of probing for audio capability

Cc: Mike Thomas <rmthomas@sciolus.org>
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 6ae2dbec

drivers/staging/easycap/easycap.h

+0 −1
Original line number Diff line number Diff line
@@ -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.

drivers/staging/easycap/easycap_low.c

+0 −8
Original line number Diff line number Diff line
@@ -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},

drivers/staging/easycap/easycap_main.c

+0 −6
Original line number Diff line number Diff line
@@ -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;