Do not lock the cardstate structure mutex earlier than necessary.
Signed-off-by: Tilman Schmidt <[EMAIL PROTECTED]>
---
drivers/isdn/gigaset/common.c | 4 +---
drivers/isdn/gigaset/interface.c | 3 +++
3 files changed, 4 insertions(+), 3 deletions(-)
diff -rupX dont-diff linux-2.6.20-rc6-mm3-orig/drivers/isdn/gigaset/common.c
local/drivers/isdn/gigaset/common.c
--- linux-2.6.20-rc6-mm3-orig/drivers/isdn/gigaset/common.c 2007-02-01
01:24:38.000000000 +0100
+++ local/drivers/isdn/gigaset/common.c 2007-02-01 01:09:51.000000000 +0100
@@ -640,7 +640,6 @@ struct cardstate *gigaset_initcs(struct
return NULL;
}
mutex_init(&cs->mutex);
- mutex_lock(&cs->mutex);
gig_dbg(DEBUG_INIT, "allocating bcs[0..%d]", channels - 1);
cs->bcs = kmalloc(channels * sizeof(struct bc_state), GFP_KERNEL);
@@ -738,6 +737,7 @@ struct cardstate *gigaset_initcs(struct
++cs->cs_init;
+ /* set up character device */
gigaset_if_init(cs);
/* set up device sysfs */
@@ -753,11 +753,9 @@ struct cardstate *gigaset_initcs(struct
add_timer(&cs->timer);
gig_dbg(DEBUG_INIT, "cs initialized");
- mutex_unlock(&cs->mutex);
return cs;
error:
- mutex_unlock(&cs->mutex);
gig_dbg(DEBUG_INIT, "failed");
gigaset_freecs(cs);
return NULL;
diff -rupX dont-diff linux-2.6.20-rc6-mm3-orig/drivers/isdn/gigaset/interface.c
local/drivers/isdn/gigaset/interface.c
--- linux-2.6.20-rc6-mm3-orig/drivers/isdn/gigaset/interface.c 2007-02-01
01:24:38.000000000 +0100
+++ local/drivers/isdn/gigaset/interface.c 2007-02-01 01:10:47.000000000
+0100
@@ -615,6 +615,8 @@ void gigaset_if_init(struct cardstate *c
return;
tasklet_init(&cs->if_wake_tasklet, &if_wake, (unsigned long) cs);
+
+ mutex_lock(&cs->mutex);
cs->tty_dev = tty_register_device(drv->tty, cs->minor_index, NULL);
if (!IS_ERR(cs->tty_dev))
@@ -623,6 +625,7 @@ void gigaset_if_init(struct cardstate *c
warn("could not register device to the tty subsystem");
cs->tty_dev = NULL;
}
+ mutex_unlock(&cs->mutex);
}
void gigaset_if_free(struct cardstate *cs)
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
