lkml.org 
[lkml]   [2012]   [May]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[ 023/117] isdn/gigaset: improve error handling querying firmware version
    3.2-stable review patch.  If anyone has any objections, please let me know.

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

    From: Tilman Schmidt <tilman@imap.cc>

    commit e055d03dc088a990fe5ea24a2d64033a168da23c upstream.

    An out-of-place "OK" response to the "AT+GMR" (get firmware version)
    command turns out to be, more often than not, a delayed response to
    a previous command rather than an actual error, so continue waiting
    for the version number in that case.

    Signed-off-by: Tilman Schmidt <tilman@imap.cc>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    [bwh: Backported to 3.2: adjust indentation]
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    drivers/isdn/gigaset/ev-layer.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/drivers/isdn/gigaset/ev-layer.c b/drivers/isdn/gigaset/ev-layer.c
    index 624a825..685638a 100644
    --- a/drivers/isdn/gigaset/ev-layer.c
    +++ b/drivers/isdn/gigaset/ev-layer.c
    @@ -190,6 +190,7 @@ struct reply_t gigaset_tab_nocid[] =
    ACT_INIT} },
    {RSP_OK, 121, 121, -1, 0, 0, {ACT_GOTVER,
    ACT_INIT} },
    +{RSP_NONE, 121, 121, -1, 120, 0, {ACT_GETSTRING} },

    /* leave dle mode */
    {RSP_INIT, 0, 0, SEQ_DLE0, 201, 5, {0}, "^SDLE=0\r"},
    @@ -1314,8 +1315,9 @@ static void do_action(int action, struct cardstate *cs,
    s = ev->ptr;

    if (!strcmp(s, "OK")) {
    + /* OK without version string: assume old response */
    *p_genresp = 1;
    - *p_resp_code = RSP_ERROR;
    + *p_resp_code = RSP_NONE;
    break;
    }




    \
     
     \ /
      Last update: 2012-05-28 06:41    [W:2.621 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site