s390/qeth: on gdev release, reset drvdata

qeth_core_probe_device() sets the gdev's drvdata, but doesn't reset it
on a subsequent error. Move the (re-)setting around a bit, so that it
happens symmetrically on allocating/freeing the qeth_card struct.

This is no actual problem, as the ccwgroup core will discard the gdev
on a probe error. But from qeth's perspective the gdev is an external
resource, so it's best to manage it cleanly.

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

diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
index 1fed8f113f4018ad7f90f1e9653b73ce43ae2584..a6c632d36df8be7951ae3b140cb3f39036a78596 100644 (file)
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -1513,6 +1513,7 @@ static struct qeth_card *qeth_alloc_card(struct ccwgroup_device *gdev)
        QETH_DBF_HEX(SETUP, 2, &card, sizeof(void *));
 
        card->gdev = gdev;
+       dev_set_drvdata(&gdev->dev, card);
        CARD_RDEV(card) = gdev->cdev[0];
        CARD_WDEV(card) = gdev->cdev[1];
        CARD_DDEV(card) = gdev->cdev[2];
@@ -1531,6 +1532,7 @@ out_data:
 out_channel:
        qeth_clean_channel(&card->read);
 out_ip:
+       dev_set_drvdata(&gdev->dev, NULL);
        kfree(card);
 out:
        return NULL;
@@ -5074,6 +5076,7 @@ static void qeth_core_free_card(struct qeth_card *card)
        qeth_clean_channel(&card->data);
        qeth_free_qdio_buffers(card);
        unregister_service_level(&card->qeth_service_level);
+       dev_set_drvdata(&card->gdev->dev, NULL);
        kfree(card);
 }
 
@@ -5788,7 +5791,6 @@ static int qeth_core_probe_device(struct ccwgroup_device *gdev)
                        goto err_card;
        }
 
-       dev_set_drvdata(&gdev->dev, card);
        qeth_setup_card(card);
        qeth_update_from_chp_desc(card);
 
@@ -5851,7 +5853,6 @@ static void qeth_core_remove_device(struct ccwgroup_device *gdev)
        write_unlock_irq(&qeth_core_card_list.rwlock);
        free_netdev(card->dev);
        qeth_core_free_card(card);
-       dev_set_drvdata(&gdev->dev, NULL);
        put_device(&gdev->dev);
 }