lkml.org 
[lkml]   [2010]   [Mar]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[048/116] gigaset: correct clearing of at_state strings on RING
    2.6.32-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Tilman Schmidt <tilman@imap.cc>

    commit 3a0a3a6b92edf181f849ebd8417122392ba73a96 upstream.

    In RING handling, clear the table of received parameter strings in
    a loop like everywhere else, instead of by enumeration which had
    already gotten out of sync.

    Impact: minor bugfix
    Signed-off-by: Tilman Schmidt <tilman@imap.cc>
    Acked-by: Karsten Keil <keil@b1-systems.de>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/isdn/gigaset/ev-layer.c | 12 ++++--------
    1 file changed, 4 insertions(+), 8 deletions(-)

    --- a/drivers/isdn/gigaset/ev-layer.c
    +++ b/drivers/isdn/gigaset/ev-layer.c
    @@ -1243,14 +1243,10 @@ static void do_action(int action, struct
    * 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);



    \
     
     \ /
      Last update: 2010-03-31 02:13    [W:3.171 / U:12.800 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site