Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 87037
b: refs/heads/master
c: 5d49c10
h: refs/heads/master
i:
  87035: 1cc8729
v: v3
  • Loading branch information
Tilman Schmidt authored and Linus Torvalds committed Mar 7, 2008
1 parent d0f40b3 commit 415107e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 1d6789c3bc2b70bed1eb71aa616b1d94f9c23a63
refs/heads/master: 5d49c101a126808a38f2a1f4eedc1fd28233e37f
6 changes: 4 additions & 2 deletions trunk/drivers/isdn/gigaset/common.c
Original file line number Diff line number Diff line change
Expand Up @@ -637,7 +637,6 @@ struct cardstate *gigaset_initcs(struct gigaset_driver *drv, int channels,
err("maximum number of devices exceeded");
return NULL;
}
mutex_init(&cs->mutex);

gig_dbg(DEBUG_INIT, "allocating bcs[0..%d]", channels - 1);
cs->bcs = kmalloc(channels * sizeof(struct bc_state), GFP_KERNEL);
Expand Down Expand Up @@ -898,8 +897,10 @@ int gigaset_shutdown(struct cardstate *cs)
{
mutex_lock(&cs->mutex);

if (!(cs->flags & VALID_MINOR))
if (!(cs->flags & VALID_MINOR)) {
mutex_unlock(&cs->mutex);
return -1;
}

cs->waiting = 1;

Expand Down Expand Up @@ -1086,6 +1087,7 @@ struct gigaset_driver *gigaset_initdriver(unsigned minor, unsigned minors,
drv->cs[i].driver = drv;
drv->cs[i].ops = drv->ops;
drv->cs[i].minor_index = i;
mutex_init(&drv->cs[i].mutex);
}

gigaset_if_initdriver(drv, procname, devname);
Expand Down

0 comments on commit 415107e

Please sign in to comment.