Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7435f50e authored by Tilman Schmidt's avatar Tilman Schmidt Committed by Linus Torvalds
Browse files

[PATCH] drivers/isdn/gigaset: reduce mutex scope 



Do not lock the cardstate structure mutex earlier than necessary.

Signed-off-by: default avatarTilman Schmidt <tilman@imap.cc>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 163da958

drivers/isdn/gigaset/common.c

+1 −3
Original line number Diff line number Diff line
@@ -640,7 +640,6 @@ struct cardstate *gigaset_initcs(struct gigaset_driver *drv, int channels, 
		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 gigaset_driver *drv, int channels, 


	++cs->cs_init;



	/* set up character device */

	gigaset_if_init(cs);



	/* set up device sysfs */
@@ -753,11 +753,9 @@ struct cardstate *gigaset_initcs(struct gigaset_driver *drv, int channels, 
	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;

drivers/isdn/gigaset/interface.c

+3 −0
Original line number Diff line number Diff line
@@ -615,6 +615,8 @@ void gigaset_if_init(struct cardstate *cs) 
		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 *cs) 
		warn("could not register device to the tty subsystem");

		cs->tty_dev = NULL;

	}

	mutex_unlock(&cs->mutex);

}



void gigaset_if_free(struct cardstate *cs)