diff options
| author | Tilman Schmidt <tilman@imap.cc> | 2012-04-25 13:02:20 +0000 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2012-05-31 00:43:24 +0100 |
| commit | da06a5287cbb08379c844618860790adb4f38a0f (patch) | |
| tree | 7d6f8ae275c8788939b62fcdd5cd9b819de57c41 /drivers/isdn | |
| parent | fbe5b22733f528f4d4d929ef53105956bddc2059 (diff) | |
| download | kernel_samsung_smdk4412-da06a5287cbb08379c844618860790adb4f38a0f.zip kernel_samsung_smdk4412-da06a5287cbb08379c844618860790adb4f38a0f.tar.gz kernel_samsung_smdk4412-da06a5287cbb08379c844618860790adb4f38a0f.tar.bz2 | |
isdn/gigaset: improve error handling querying firmware version
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>
Diffstat (limited to 'drivers/isdn')
| -rw-r--r-- | drivers/isdn/gigaset/ev-layer.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/isdn/gigaset/ev-layer.c b/drivers/isdn/gigaset/ev-layer.c index 6d12623..e95fac0 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; } |