From: John Stultz Date: Wed, 8 May 2013 23:06:16 +0000 (-0700) Subject: dcc_tty: Build fixups X-Git-Tag: firefly_0821_release~3680^2~4^2~41^2~9 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c457bb048e4ba70527e0f0bd2e4e55359905a29f;p=firefly-linux-kernel-4.4.55.git dcc_tty: Build fixups Fix spinlock declaration and tty_insert/flip arguments. Signed-off-by: John Stultz --- diff --git a/drivers/char/dcc_tty.c b/drivers/char/dcc_tty.c index a787accdcb14..0a62d410286f 100644 --- a/drivers/char/dcc_tty.c +++ b/drivers/char/dcc_tty.c @@ -26,7 +26,7 @@ MODULE_DESCRIPTION("DCC TTY Driver"); MODULE_LICENSE("GPL"); MODULE_VERSION("1.0"); -static spinlock_t g_dcc_tty_lock = SPIN_LOCK_UNLOCKED; +DEFINE_SPINLOCK(g_dcc_tty_lock); static struct hrtimer g_dcc_timer; static char g_dcc_buffer[16]; static int g_dcc_buffer_head; @@ -80,8 +80,8 @@ static void dcc_poll_locked(void) ); if (rch >= 0) { ch = rch; - tty_insert_flip_string(g_dcc_tty, &ch, 1); - tty_flip_buffer_push(g_dcc_tty); + tty_insert_flip_string(g_dcc_tty->port, &ch, 1); + tty_flip_buffer_push(g_dcc_tty->port); } }