projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[cascardo/linux.git]
/
drivers
/
tty
/
tty_ldisc.c
diff --git
a/drivers/tty/tty_ldisc.c
b/drivers/tty/tty_ldisc.c
index
0fc564a
..
e19e136
100644
(file)
--- a/
drivers/tty/tty_ldisc.c
+++ b/
drivers/tty/tty_ldisc.c
@@
-529,7
+529,7
@@
static void tty_ldisc_restore(struct tty_struct *tty, struct tty_ldisc *old)
static int tty_ldisc_halt(struct tty_struct *tty)
{
clear_bit(TTY_LDISC, &tty->flags);
static int tty_ldisc_halt(struct tty_struct *tty)
{
clear_bit(TTY_LDISC, &tty->flags);
- return cancel_
delayed_
work_sync(&tty->buf.work);
+ return cancel_work_sync(&tty->buf.work);
}
/**
}
/**
@@
-542,7
+542,7
@@
static void tty_ldisc_flush_works(struct tty_struct *tty)
{
flush_work_sync(&tty->hangup_work);
flush_work_sync(&tty->SAK_work);
{
flush_work_sync(&tty->hangup_work);
flush_work_sync(&tty->SAK_work);
- flush_
delayed_
work_sync(&tty->buf.work);
+ flush_work_sync(&tty->buf.work);
}
/**
}
/**
@@
-722,9
+722,9
@@
enable:
/* Restart the work queue in case no characters kick it off. Safe if
already running */
if (work)
/* Restart the work queue in case no characters kick it off. Safe if
already running */
if (work)
- schedule_
delayed_work(&tty->buf.work, 1
);
+ schedule_
work(&tty->buf.work
);
if (o_work)
if (o_work)
- schedule_
delayed_work(&o_tty->buf.work, 1
);
+ schedule_
work(&o_tty->buf.work
);
mutex_unlock(&tty->ldisc_mutex);
tty_unlock();
return retval;
mutex_unlock(&tty->ldisc_mutex);
tty_unlock();
return retval;
@@
-830,12
+830,12
@@
void tty_ldisc_hangup(struct tty_struct *tty)
/*
* this is like tty_ldisc_halt, but we need to give up
/*
* this is like tty_ldisc_halt, but we need to give up
- * the BTM before calling cancel_
delayed_work_sync,
- *
which may
need to wait for another function taking the BTM
+ * the BTM before calling cancel_
work_sync, which may
+ * need to wait for another function taking the BTM
*/
clear_bit(TTY_LDISC, &tty->flags);
tty_unlock();
*/
clear_bit(TTY_LDISC, &tty->flags);
tty_unlock();
- cancel_
delayed_
work_sync(&tty->buf.work);
+ cancel_work_sync(&tty->buf.work);
mutex_unlock(&tty->ldisc_mutex);
tty_lock();
mutex_unlock(&tty->ldisc_mutex);
tty_lock();