From 3d3e4f2187cc4e15d8001b64043f728ac8fffd91 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 7 Oct 2010 19:30:49 -0700 Subject: [PATCH] --- yaml --- r: 220169 b: refs/heads/master c: 5b19208a5e236b26357162d6a28ff9e8d4296725 h: refs/heads/master i: 220167: 832fdbb5fc3b3340559da207f9690c8051af6879 v: v3 --- [refs] | 2 +- trunk/drivers/staging/speakup/buffers.c | 9 ++++----- trunk/drivers/staging/speakup/main.c | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index f069c174cb54..c7b410a442a2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c6e3fd22cd538365bfeb82997d5b89562e077d42 +refs/heads/master: 5b19208a5e236b26357162d6a28ff9e8d4296725 diff --git a/trunk/drivers/staging/speakup/buffers.c b/trunk/drivers/staging/speakup/buffers.c index 6dd53cf348f6..b7b60d5e8660 100644 --- a/trunk/drivers/staging/speakup/buffers.c +++ b/trunk/drivers/staging/speakup/buffers.c @@ -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) diff --git a/trunk/drivers/staging/speakup/main.c b/trunk/drivers/staging/speakup/main.c index 8c549650f217..2ef3b3982a2d 100644 --- a/trunk/drivers/staging/speakup/main.c +++ b/trunk/drivers/staging/speakup/main.c @@ -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 &&