Commit e327325f authored by Jiri Slaby's avatar Jiri Slaby Committed by Linus Torvalds
Browse files

Char: isicom, del_timer at exit 



Signed-off-by: default avatarJiri Slaby <jirislaby@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 5b21f9dd

drivers/char/isicom.c

+1 −11
Original line number Diff line number Diff line
@@ -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);