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>

diff --git a/drivers/staging/speakup/buffers.c b/drivers/staging/speakup/buffers.c
index 6dd53cf..b7b60d5 100644 (file)
--- 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)

diff --git a/drivers/staging/speakup/main.c b/drivers/staging/speakup/main.c
index 8c54965..2ef3b39 100644 (file)
--- a/drivers/staging/speakup/main.c
+++ b/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 &&