Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Char: isicom, del_timer at exit

Browse source 
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Jiri Slaby 2007-07-17 04:05:18 -07:00 • committed by Linus Torvalds
parent 5b21f9dddd
commit e327325f42
1 changed files with 1 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/char/isicom.c
View file

@ -171,9 +171,6 @@ static struct pci_driver isicom_driver = {
static int prev_card = 3; /* start servicing isi_card[0] */ static int prev_card = 3; /* start servicing isi_card[0] */
static struct tty_driver *isicom_normal; 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_tx(unsigned long _data);
static void isicom_start(struct tty_struct *tty); 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); spin_unlock_irqrestore(&isi_card[card].card_lock, flags);
/* schedule another tx for hopefully in about 10ms */ /* schedule another tx for hopefully in about 10ms */
sched_again: sched_again:
if (!re_schedule) {
complete(&isi_timerdone);
return;
}
mod_timer(&tx, jiffies + msecs_to_jiffies(10)); mod_timer(&tx, jiffies + msecs_to_jiffies(10));
} }
@ -1890,9 +1882,7 @@ static int __init isicom_init(void)
static void __exit isicom_exit(void) static void __exit isicom_exit(void)
{ {
re_schedule = 0; del_timer_sync(&tx);
wait_for_completion_timeout(&isi_timerdone, HZ);
pci_unregister_driver(&isicom_driver); pci_unregister_driver(&isicom_driver);
tty_unregister_driver(isicom_normal); tty_unregister_driver(isicom_normal);