openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Staging: speakup: fix speakup core to build properly 

The vc_data structure changed to move the tty structure off to the port,
so change the code to handle this.  Now the code will build properly,
and hopefully work as well.

Cc: William Hubbs <w.d.hubbs@gmail.com>
Cc: Samuel Thibault <samuel.thibault@ens-lyon.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Greg Kroah-Hartman 2010-10-07 19:30:49 -07:00
parent c6e3fd22cd
commit 5b19208a5e
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/staging/speakup/buffers.c
View File

@ -28,8 +28,8 @@ void speakup_start_ttys(void)
for (i = 0; i < MAX_NR_CONSOLES; i++) {
if (speakup_console[i] && speakup_console[i]->tty_stopped)
continue;
if ((vc_cons[i].d != NULL) && (vc_cons[i].d->vc_tty != NULL))
start_tty(vc_cons[i].d->vc_tty);
if ((vc_cons[i].d != NULL) && (vc_cons[i].d->port.tty != NULL))
start_tty(vc_cons[i].d->port.tty);
}
}
EXPORT_SYMBOL_GPL(speakup_start_ttys);
@ -39,9 +39,8 @@ static void speakup_stop_ttys(void)
int i;
for (i = 0; i < MAX_NR_CONSOLES; i++)
if ((vc_cons[i].d != NULL) && (vc_cons[i].d->vc_tty != NULL))
stop_tty(vc_cons[i].d->vc_tty);
return;
if ((vc_cons[i].d != NULL) && (vc_cons[i].d->port.tty != NULL))
stop_tty(vc_cons[i].d->port.tty);
}
static int synth_buffer_free(void)

2
drivers/staging/speakup/main.c
View File

@ -2010,7 +2010,7 @@ speakup_key(struct vc_data *vc, int shift_state, int keycode, u_short keysym,
return 0;
spk_lock(flags);
tty = vc->vc_tty;
tty = vc->port.tty;
if (type >= 0xf0)
type -= 0xf0;
if (type == KT_PAD &&