diff options
| author |   Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-07 19:30:49 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-07 19:30:49 -0700 |
| commit | 5b19208a5e236b26357162d6a28ff9e8d4296725 (patch) | |
| tree | 612fd61bd82d1e83ee37eb5fc85b95299394e5ba /drivers/staging/speakup/buffers.c | |
| parent | Staging: add speakup to the staging directory (diff) | |
| download | linux-dev-5b19208a5e236b26357162d6a28ff9e8d4296725.tar.xz linux-dev-5b19208a5e236b26357162d6a28ff9e8d4296725.zip | |
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>
Diffstat (limited to 'drivers/staging/speakup/buffers.c')
| -rw-r--r-- | drivers/staging/speakup/buffers.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/staging/speakup/buffers.c b/drivers/staging/speakup/buffers.c index 6dd53cf348f6..b7b60d5e8660 100644 --- a/drivers/staging/speakup/buffers.c +++ b/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) |