diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-04 15:59:47 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-04 15:59:47 +0100 |
commit | 5cb2faa6ede7ada9cb2bffc832c4ce60f53d6834 (patch) | |
tree | 7b72b66081d042a41dc822575503133364857ce2 /drivers/isdn/mISDN/stack.c | |
parent | ARM: 5846/1: MAINTAINERS: Add arm Nomadik support (diff) | |
parent | ARM: I-cache: flush executable mappings in flush_cache_range() (diff) | |
download | linux-5cb2faa6ede7ada9cb2bffc832c4ce60f53d6834.tar.xz linux-5cb2faa6ede7ada9cb2bffc832c4ce60f53d6834.zip |
Merge branch 'pending-misc' (early part) into devel
Diffstat (limited to 'drivers/isdn/mISDN/stack.c')
-rw-r--r-- | drivers/isdn/mISDN/stack.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/isdn/mISDN/stack.c b/drivers/isdn/mISDN/stack.c index 3e1532a180ff..0d05ec43012c 100644 --- a/drivers/isdn/mISDN/stack.c +++ b/drivers/isdn/mISDN/stack.c @@ -364,7 +364,7 @@ add_layer2(struct mISDNchannel *ch, struct mISDNstack *st) static int st_own_ctrl(struct mISDNchannel *ch, u_int cmd, void *arg) { - if (!ch->st || ch->st->layer1) + if (!ch->st || !ch->st->layer1) return -EINVAL; return ch->st->layer1->ctrl(ch->st->layer1, cmd, arg); } |