Skip to content

Commit

Permalink
stagine/easycap: use module paramter for default encoding instead of …
Browse files Browse the repository at this point in the history
…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>
  • Loading branch information
Tomas Winkler authored and Greg Kroah-Hartman committed Feb 9, 2011
1 parent aff512c commit 8d61395
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 8 deletions.
1 change: 0 additions & 1 deletion drivers/staging/easycap/easycap.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
*/
/*---------------------------------------------------------------------------*/
#define PATIENCE 500
#undef PREFER_NTSC
#define PERSEVERE
/*---------------------------------------------------------------------------*/
/*
Expand Down
14 changes: 7 additions & 7 deletions drivers/staging/easycap/easycap_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@ static int easycap_gain = 16;
module_param_named(gain, easycap_gain, int, S_IRUGO | S_IWUSR);
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];
Expand Down Expand Up @@ -4102,13 +4106,9 @@ static int easycap_usb_probe(struct usb_interface *pusb_interface,
* BEWARE.
*/
/*---------------------------------------------------------------------------*/
#ifdef PREFER_NTSC
peasycap->ntsc = true;
JOM(8, "defaulting initially to NTSC\n");
#else
peasycap->ntsc = false;
JOM(8, "defaulting initially to PAL\n");
#endif /*PREFER_NTSC*/
peasycap->ntsc = easycap_ntsc;
JOM(8, "defaulting initially to %s\n",
easycap_ntsc ? "NTSC" : "PAL");
rc = reset(peasycap);
if (rc) {
SAM("ERROR: reset() returned %i\n", rc);
Expand Down

0 comments on commit 8d61395

Please sign in to comment.