dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

stagine/easycap: use module paramter for default encoding instead of ifdef 

remove PREFER_NTSC ifdef as it cannot be possible put into Kconfig

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:42 +02:00 committed by Greg Kroah-Hartman
parent aff512c8a4
commit 8d6139547c
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,7 +49,6 @@
*/ */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#define PATIENCE 500 #define PATIENCE 500
#undef PREFER_NTSC
#define PERSEVERE #define PERSEVERE
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* /*

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

@ -51,6 +51,10 @@ static int easycap_gain = 16;
module_param_named(gain, easycap_gain, int, S_IRUGO | S_IWUSR); module_param_named(gain, easycap_gain, int, S_IRUGO | S_IWUSR);
MODULE_PARM_DESC(gain, "Audio gain: 0,...,16(default),...31"); MODULE_PARM_DESC(gain, "Audio gain: 0,...,16(default),...31");
static bool easycap_ntsc;
module_param_named(ntsc, easycap_ntsc, bool, S_IRUGO | S_IWUSR);
MODULE_PARM_DESC(ntsc, "NTCS default encoding (default PAL)");
struct easycap_dongle easycapdc60_dongle[DONGLE_MANY]; struct easycap_dongle easycapdc60_dongle[DONGLE_MANY];
@ -4102,13 +4106,9 @@ static int easycap_usb_probe(struct usb_interface *pusb_interface,
* BEWARE. * BEWARE.
*/ */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#ifdef PREFER_NTSC peasycap->ntsc = easycap_ntsc;
peasycap->ntsc = true; JOM(8, "defaulting initially to %s\n",
JOM(8, "defaulting initially to NTSC\n"); easycap_ntsc ? "NTSC" : "PAL");
#else
peasycap->ntsc = false;
JOM(8, "defaulting initially to PAL\n");
#endif /*PREFER_NTSC*/
rc = reset(peasycap); rc = reset(peasycap);
if (rc) { if (rc) {
SAM("ERROR: reset() returned %i\n", rc); SAM("ERROR: reset() returned %i\n", rc);