2 files changed, 9 insertions, 3 deletions

diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c
index e4b11afbbc9f..0fd663b23d76 100644
--- a/drivers/s390/net/lcs.c
+++ b/drivers/s390/net/lcs.c
@@ -1400,11 +1400,14 @@ lcs_irq(struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
                 PRINT_WARN("check on device %s, dstat=0x%X, cstat=0x%X \n",
                             cdev->dev.bus_id, dstat, cstat);
                 if (rc) {
-                        lcs_schedule_recovery(card);
-                        wake_up(&card->wait_q);
-                        return;
+                        channel->state = LCS_CH_STATE_ERROR;
                 }
         }
+        if (channel->state == LCS_CH_STATE_ERROR) {
+                lcs_schedule_recovery(card);
+                wake_up(&card->wait_q);
+                return;
+        }
         /* How far in the ccw chain have we processed? */
         if ((channel->state != LCS_CH_STATE_INIT) &&
             (irb->scsw.fctl & SCSW_FCTL_START_FUNC)) {
@@ -1708,6 +1711,8 @@ lcs_stopcard(struct lcs_card *card)
 
         if (card->read.state != LCS_CH_STATE_STOPPED &&
             card->write.state != LCS_CH_STATE_STOPPED &&
+            card->read.state != LCS_CH_STATE_ERROR &&
+            card->write.state != LCS_CH_STATE_ERROR &&
             card->state == DEV_STATE_UP) {
                 lcs_clear_multicast_list(card);
                 rc = lcs_send_stoplan(card,LCS_INITIATOR_TCPIP);
diff --git a/drivers/s390/net/lcs.h b/drivers/s390/net/lcs.h
index 0e1e4a0a88f0..8976fb0b070a 100644
--- a/drivers/s390/net/lcs.h
+++ b/drivers/s390/net/lcs.h
@@ -138,6 +138,7 @@ enum lcs_channel_states {
         LCS_CH_STATE_RUNNING,
         LCS_CH_STATE_SUSPENDED,
         LCS_CH_STATE_CLEARED,
+        LCS_CH_STATE_ERROR,
 };
 
 /**