|
@@ -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);
|