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

Commit 88e88249 authored by David Howells's avatar David Howells Committed by Linus Torvalds
Browse files

Fix the epca driver to permit epca_setup() to be invoked from the kernel cmdline 



Fix the epca driver to call epca_setup() if digiepca=xxx is included on the
command line and the epca driver is built in.

epca_setup() used to be called from init/main.c in 2.2 kernels, but somewhere
along the way that call was removed but not replaced.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e129deff

drivers/char/epca.c

+13 −2
Original line number Diff line number Diff line
@@ -186,7 +186,6 @@ static void pc_throttle(struct tty_struct *tty); 
static void pc_unthrottle(struct tty_struct *tty);

static int pc_send_break(struct tty_struct *tty, int msec);

static void setup_empty_event(struct tty_struct *tty, struct channel *ch);

static void epca_setup(char *, int *);



static int pc_write(struct tty_struct *, const unsigned char *, int);

static int pc_init(void);
@@ -2513,7 +2512,8 @@ static void setup_empty_event(struct tty_struct *tty, struct channel *ch) 
	memoff(ch);

}



static void epca_setup(char *str, int *ints)

#ifndef MODULE

static void __init epca_setup(char *str, int *ints)

{

	struct board_info board;

	int               index, loop, last;
@@ -2767,6 +2767,17 @@ static void epca_setup(char *str, int *ints) 
	num_cards++;

}



static int __init epca_real_setup(char *str)

{

	int ints[11];



	epca_setup(get_options(str, 11, ints), ints);

	return 1;

}



__setup("digiepca", epca_real_setup);

#endif



enum epic_board_types {

	brd_xr = 0,

	brd_xem,