diff options
| author | Tilman Schmidt <tilman@imap.cc> | 2014-10-03 11:03:32 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-10-05 21:17:52 -0400 |
| commit | 5dcd7d843950edfc9108246eab94c858b6dc5d6f (patch) | |
| tree | 4d08a1e3144e30f47f319991b54f3817d4a93240 | |
| parent | 51db998fb6e04e8dfcf4e33295651367b91238a5 (diff) | |
isdn/gigaset: improve error handling when leaving DLE mode
Avoid cascading warnings when leaving DLE mode fails by clearing
the DLE flag before entering recovery.
Signed-off-by: Tilman Schmidt <tilman@imap.cc>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/isdn/gigaset/ev-layer.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/isdn/gigaset/ev-layer.c b/drivers/isdn/gigaset/ev-layer.c index 7459b127ddd5..dcae14aef376 100644 --- a/drivers/isdn/gigaset/ev-layer.c +++ b/drivers/isdn/gigaset/ev-layer.c | |||
| @@ -1243,7 +1243,8 @@ static void do_action(int action, struct cardstate *cs, | |||
| 1243 | break; | 1243 | break; |
| 1244 | case ACT_FAILDLE0: | 1244 | case ACT_FAILDLE0: |
| 1245 | cs->cur_at_seq = SEQ_NONE; | 1245 | cs->cur_at_seq = SEQ_NONE; |
| 1246 | dev_warn(cs->dev, "Could not leave DLE mode.\n"); | 1246 | dev_warn(cs->dev, "Error leaving DLE mode.\n"); |
| 1247 | cs->dle = 0; | ||
| 1247 | at_state2 = &cs->bcs[cs->curchannel].at_state; | 1248 | at_state2 = &cs->bcs[cs->curchannel].at_state; |
| 1248 | disconnect(&at_state2); | 1249 | disconnect(&at_state2); |
| 1249 | schedule_init(cs, MS_RECOVER); | 1250 | schedule_init(cs, MS_RECOVER); |
