diff options
| author | James Morris <jmorris@namei.org> | 2011-01-09 17:46:24 -0500 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-01-09 17:46:24 -0500 |
| commit | d2e7ad19229f982fc1eb731827d82ceac90abfb3 (patch) | |
| tree | 98a3741b4d4b27a48b3c7ea9babe331e539416a8 /drivers/char/hvsi.c | |
| parent | d03a5d888fb688c832d470b749acc5ed38e0bc1d (diff) | |
| parent | 0c21e3aaf6ae85bee804a325aa29c325209180fd (diff) | |
Merge branch 'master' into next
Conflicts:
security/smack/smack_lsm.c
Verified and added fix by Stephen Rothwell <sfr@canb.auug.org.au>
Ok'd by Casey Schaufler <casey@schaufler-ca.com>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'drivers/char/hvsi.c')
| -rw-r--r-- | drivers/char/hvsi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/hvsi.c b/drivers/char/hvsi.c index a2bc885ce60a..67a75a502c01 100644 --- a/drivers/char/hvsi.c +++ b/drivers/char/hvsi.c | |||
| @@ -850,8 +850,8 @@ static void hvsi_flush_output(struct hvsi_struct *hp) | |||
| 850 | wait_event_timeout(hp->emptyq, (hp->n_outbuf <= 0), HVSI_TIMEOUT); | 850 | wait_event_timeout(hp->emptyq, (hp->n_outbuf <= 0), HVSI_TIMEOUT); |
| 851 | 851 | ||
| 852 | /* 'writer' could still be pending if it didn't see n_outbuf = 0 yet */ | 852 | /* 'writer' could still be pending if it didn't see n_outbuf = 0 yet */ |
| 853 | cancel_delayed_work(&hp->writer); | 853 | cancel_delayed_work_sync(&hp->writer); |
| 854 | flush_scheduled_work(); | 854 | flush_work_sync(&hp->handshaker); |
| 855 | 855 | ||
| 856 | /* | 856 | /* |
| 857 | * it's also possible that our timeout expired and hvsi_write_worker | 857 | * it's also possible that our timeout expired and hvsi_write_worker |