lkml.org 
[lkml]   [2008]   [Jun]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH] gigaset: fix module reference counting
bas_gigaset can't be unloaded due to wrong module reference counting.
Ensure that module_put is called whenever a channel is freed.

Signed-off-by: Andreas Herrmann <aherrman@arcor.de>
---
drivers/isdn/gigaset/common.c | 5 +----
drivers/isdn/gigaset/gigaset.h | 1 -
2 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/drivers/isdn/gigaset/common.c b/drivers/isdn/gigaset/common.c
index 827c32c..8498317 100644
--- a/drivers/isdn/gigaset/common.c
+++ b/drivers/isdn/gigaset/common.c
@@ -184,7 +184,6 @@ int gigaset_get_channel(struct bc_state *bcs)
return 0;
}
++bcs->use_count;
- bcs->busy = 1;
gig_dbg(DEBUG_ANY, "allocated channel %d", bcs->channel);
spin_unlock_irqrestore(&bcs->cs->lock, flags);
return 1;
@@ -195,13 +194,12 @@ void gigaset_free_channel(struct bc_state *bcs)
unsigned long flags;

spin_lock_irqsave(&bcs->cs->lock, flags);
- if (!bcs->busy) {
+ if (!bcs->use_count) {
gig_dbg(DEBUG_ANY, "could not free channel %d", bcs->channel);
spin_unlock_irqrestore(&bcs->cs->lock, flags);
return;
}
--bcs->use_count;
- bcs->busy = 0;
module_put(bcs->cs->driver->owner);
gig_dbg(DEBUG_ANY, "freed channel %d", bcs->channel);
spin_unlock_irqrestore(&bcs->cs->lock, flags);
@@ -589,7 +587,6 @@ static struct bc_state *gigaset_initbcs(struct bc_state *bcs,

bcs->chstate = 0;
bcs->use_count = 1;
- bcs->busy = 0;
bcs->ignore = cs->ignoreframes;

for (i = 0; i < AT_NUM; ++i)
diff --git a/drivers/isdn/gigaset/gigaset.h b/drivers/isdn/gigaset/gigaset.h
index f365993..ef1bc17 100644
--- a/drivers/isdn/gigaset/gigaset.h
+++ b/drivers/isdn/gigaset/gigaset.h
@@ -419,7 +419,6 @@ struct bc_state {
#ifdef CONFIG_GIGASET_DEBUG
int emptycount;
#endif
- int busy;
int use_count;

/* private data of hardware drivers */
--
1.5.3.7



\
 
 \ /
  Last update: 2008-06-06 22:47    [W:0.046 / U:0.352 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site