aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Stultz <john.stultz@linaro.org>2013-05-08 16:06:16 -0700
committerJohn Stultz <john.stultz@linaro.org>2013-05-08 16:06:16 -0700
commit4d591afac92816892ace872dd68eb23c4545711f (patch)
tree613bea2ea9b5bfe8698c1c598b09f284caa5d9bb
parent5cf418c983653d0cbb450ab10cad0ef9d5383adb (diff)
Fix spinlock declaration and tty_insert/flip arguments. Signed-off-by: John Stultz <john.stultz@linaro.org>
-rw-r--r--drivers/char/dcc_tty.c6
1 files changed, 3 insertions, 3 deletions
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);
}
}