From 21b70dd8d174aada436397951a04742ab6c7b9e6 Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Fri, 8 Dec 2006 02:38:55 -0800 Subject: [PATCH] --- yaml --- r: 43699 b: refs/heads/master c: 906cdecbedae93e3f63651000f620acddf4debe9 h: refs/heads/master i: 43697: 80cc4d2b48ed109df721ce6d62f81608cf4a65b4 43695: 06549aa0e464738e3c56eff13c1d1f6ca764ce96 v: v3 --- [refs] | 2 +- trunk/drivers/char/isicom.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 6e5bd8176926..3c4edf8138b2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f0671378426d9768bf20d5e0f8389374dcdc2abf +refs/heads/master: 906cdecbedae93e3f63651000f620acddf4debe9 diff --git a/trunk/drivers/char/isicom.c b/trunk/drivers/char/isicom.c index 783a7ec0a8e6..734fe39a6ac2 100644 --- a/trunk/drivers/char/isicom.c +++ b/trunk/drivers/char/isicom.c @@ -172,6 +172,7 @@ static struct pci_driver isicom_driver = { static int prev_card = 3; /* start servicing isi_card[0] */ static struct tty_driver *isicom_normal; +static DECLARE_COMPLETION(isi_timerdone); static struct timer_list tx; static char re_schedule = 1; @@ -514,7 +515,7 @@ static void isicom_tx(unsigned long _data) /* schedule another tx for hopefully in about 10ms */ sched_again: if (!re_schedule) { - re_schedule = 2; + complete(&isi_timerdone); return; } @@ -1924,12 +1925,9 @@ static int __init isicom_init(void) static void __exit isicom_exit(void) { - unsigned int index = 0; - re_schedule = 0; - while (re_schedule != 2 && index++ < 100) - msleep(10); + wait_for_completion_timeout(&isi_timerdone, HZ); pci_unregister_driver(&isicom_driver); tty_unregister_driver(isicom_normal);