diff options
Diffstat (limited to 'drivers/isdn/gigaset/common.c')
-rw-r--r-- | drivers/isdn/gigaset/common.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/isdn/gigaset/common.c b/drivers/isdn/gigaset/common.c index 4f75cce6fdff..9d4ae04eb33f 100644 --- a/drivers/isdn/gigaset/common.c +++ b/drivers/isdn/gigaset/common.c | |||
@@ -640,7 +640,6 @@ struct cardstate *gigaset_initcs(struct gigaset_driver *drv, int channels, | |||
640 | return NULL; | 640 | return NULL; |
641 | } | 641 | } |
642 | mutex_init(&cs->mutex); | 642 | mutex_init(&cs->mutex); |
643 | mutex_lock(&cs->mutex); | ||
644 | 643 | ||
645 | gig_dbg(DEBUG_INIT, "allocating bcs[0..%d]", channels - 1); | 644 | gig_dbg(DEBUG_INIT, "allocating bcs[0..%d]", channels - 1); |
646 | cs->bcs = kmalloc(channels * sizeof(struct bc_state), GFP_KERNEL); | 645 | cs->bcs = kmalloc(channels * sizeof(struct bc_state), GFP_KERNEL); |
@@ -738,6 +737,7 @@ struct cardstate *gigaset_initcs(struct gigaset_driver *drv, int channels, | |||
738 | 737 | ||
739 | ++cs->cs_init; | 738 | ++cs->cs_init; |
740 | 739 | ||
740 | /* set up character device */ | ||
741 | gigaset_if_init(cs); | 741 | gigaset_if_init(cs); |
742 | 742 | ||
743 | /* set up device sysfs */ | 743 | /* set up device sysfs */ |
@@ -753,11 +753,9 @@ struct cardstate *gigaset_initcs(struct gigaset_driver *drv, int channels, | |||
753 | add_timer(&cs->timer); | 753 | add_timer(&cs->timer); |
754 | 754 | ||
755 | gig_dbg(DEBUG_INIT, "cs initialized"); | 755 | gig_dbg(DEBUG_INIT, "cs initialized"); |
756 | mutex_unlock(&cs->mutex); | ||
757 | return cs; | 756 | return cs; |
758 | 757 | ||
759 | error: | 758 | error: |
760 | mutex_unlock(&cs->mutex); | ||
761 | gig_dbg(DEBUG_INIT, "failed"); | 759 | gig_dbg(DEBUG_INIT, "failed"); |
762 | gigaset_freecs(cs); | 760 | gigaset_freecs(cs); |
763 | return NULL; | 761 | return NULL; |