From ff5e13ab57b5d48ab731f1f18693f5c607bd63a8 Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Tue, 17 Jul 2007 04:05:18 -0700 Subject: [PATCH] --- yaml --- r: 60872 b: refs/heads/master c: e327325f4219e30476c775dbcd8651cd71b5416a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/char/isicom.c | 12 +----------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index b9510daae719..68885f89c3c6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5b21f9dddd0817b761f1407f1950bee4f257411a +refs/heads/master: e327325f4219e30476c775dbcd8651cd71b5416a diff --git a/trunk/drivers/char/isicom.c b/trunk/drivers/char/isicom.c index b133b92a0ad5..2f8aaf8f8232 100644 --- a/trunk/drivers/char/isicom.c +++ b/trunk/drivers/char/isicom.c @@ -171,9 +171,6 @@ 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 char re_schedule = 1; - static void isicom_tx(unsigned long _data); static void isicom_start(struct tty_struct *tty); @@ -502,11 +499,6 @@ static void isicom_tx(unsigned long _data) spin_unlock_irqrestore(&isi_card[card].card_lock, flags); /* schedule another tx for hopefully in about 10ms */ sched_again: - if (!re_schedule) { - complete(&isi_timerdone); - return; - } - mod_timer(&tx, jiffies + msecs_to_jiffies(10)); } @@ -1890,9 +1882,7 @@ static int __init isicom_init(void) static void __exit isicom_exit(void) { - re_schedule = 0; - - wait_for_completion_timeout(&isi_timerdone, HZ); + del_timer_sync(&tx); pci_unregister_driver(&isicom_driver); tty_unregister_driver(isicom_normal);