diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2010-04-02 10:20:05 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-04-02 10:20:05 +0200 |
| commit | ac4d7f0bed9b03204539de81c8b62b35c9f4e16a (patch) | |
| tree | 6afd6fa0580f6a6f316788222b026f86b83647ac /drivers/isdn/gigaset/ev-layer.c | |
| parent | 1630ae851f808a7fe563ed8e988a42d3326bd75a (diff) | |
| parent | 19f00f070c17584b5acaf186baf4d12a7d2ed125 (diff) | |
Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.33.y
Conflicts:
Makefile
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers/isdn/gigaset/ev-layer.c')
| -rw-r--r-- | drivers/isdn/gigaset/ev-layer.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/isdn/gigaset/ev-layer.c b/drivers/isdn/gigaset/ev-layer.c index ddeb0456d202..0304d026be3e 100644 --- a/drivers/isdn/gigaset/ev-layer.c +++ b/drivers/isdn/gigaset/ev-layer.c @@ -1259,14 +1259,10 @@ static void do_action(int action, struct cardstate *cs, * note that bcs may be NULL if no B channel is free */ at_state2->ConState = 700; - kfree(at_state2->str_var[STR_NMBR]); - at_state2->str_var[STR_NMBR] = NULL; - kfree(at_state2->str_var[STR_ZCPN]); - at_state2->str_var[STR_ZCPN] = NULL; - kfree(at_state2->str_var[STR_ZBC]); - at_state2->str_var[STR_ZBC] = NULL; - kfree(at_state2->str_var[STR_ZHLC]); - at_state2->str_var[STR_ZHLC] = NULL; + for (i = 0; i < STR_NUM; ++i) { + kfree(at_state2->str_var[i]); + at_state2->str_var[i] = NULL; + } at_state2->int_var[VAR_ZCTP] = -1; spin_lock_irqsave(&cs->lock, flags); |