]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
s390/qeth: don't set card state in qeth_qdio_clear_card()
authorJulian Wiedmann <jwi@linux.ibm.com>
Thu, 31 Oct 2019 12:42:19 +0000 (13:42 +0100)
committerDavid S. Miller <davem@davemloft.net>
Thu, 31 Oct 2019 19:32:59 +0000 (12:32 -0700)
Any change to the card state should only be driven by
qeth_l?_set_online() and qeth_l?_stop_card().

qeth_qdio_clear_card() currently also gets called from
(a) qeth_core_shutdown(), where we haven't walked through the whole
    teardown sequence. So changing the state to DOWN is not accurate.
(b) qeth_core_hardsetup_card(), which is only called while the card is
    still in DOWN state. No change in behaviour here.

Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/s390/net/qeth_core_main.c

index d51dcb3c5a01076bf85440494a80c5d8ece16814..9e8bd8e081463a21c5cd131d9fe29f225d758266 100644 (file)
@@ -1513,7 +1513,6 @@ int qeth_qdio_clear_card(struct qeth_card *card, int use_halt)
        rc = qeth_clear_halt_card(card, use_halt);
        if (rc)
                QETH_CARD_TEXT_(card, 3, "2err%d", rc);
-       card->state = CARD_STATE_DOWN;
        return rc;
 }
 EXPORT_SYMBOL_GPL(qeth_qdio_clear_card);