From b2ad5f821b1381492d792ca10b1eb7a107b48f14 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Wed, 10 Jan 2001 17:17:53 +0000 Subject: Merge with Linux 2.4.0-prerelease. Big Makefile rewrite, test your Makefiles. --- drivers/atm/ambassador.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'drivers/atm/ambassador.c') diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c index 8a24cfb66..3de74d517 100644 --- a/drivers/atm/ambassador.c +++ b/drivers/atm/ambassador.c @@ -1251,15 +1251,10 @@ static int amb_open (struct atm_vcc * atm_vcc, short vpi, int vci) { } } - // prevent module unload while sleeping (kmalloc/down) - // doing this any earlier would complicate more error return paths - MOD_INC_USE_COUNT; - // get space for our vcc stuff vcc = kmalloc (sizeof(amb_vcc), GFP_KERNEL); if (!vcc) { PRINTK (KERN_ERR, "out of memory!"); - MOD_DEC_USE_COUNT; return -ENOMEM; } atm_vcc->dev_data = (void *) vcc; @@ -1425,7 +1420,6 @@ static void amb_close (struct atm_vcc * atm_vcc) { // say the VPI/VCI is free again clear_bit(ATM_VF_ADDR,&atm_vcc->flags); - MOD_DEC_USE_COUNT; return; } @@ -1703,7 +1697,8 @@ static const struct atmdev_ops amb_ops = { close: amb_close, send: amb_send, sg_send: amb_sg_send, - proc_read: amb_proc_read + proc_read: amb_proc_read, + owner: THIS_MODULE, }; /********** housekeeping **********/ -- cgit v1.2.3