Commit c1a935f6 authored by Julian Wiedmann's avatar Julian Wiedmann Committed by David S. Miller

s390/qeth: fix discipline unload after setup error

Device initialization code usually first loads a subdriver
(via qeth_core_load_discipline()), and then runs its setup() callback.
If this fails, it rolls back the load via qeth_core_free_discipline().

qeth_core_free_discipline() expects the options.layer attribute to be
initialized, but on error in setup() that's currently not the case.
Resulting in misbalanced symbol_put() calls.

Fix this by setting options.layer when loading the subdriver.
Signed-off-by: default avatarJulian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a70fee3b
...@@ -5614,6 +5614,7 @@ int qeth_core_load_discipline(struct qeth_card *card, ...@@ -5614,6 +5614,7 @@ int qeth_core_load_discipline(struct qeth_card *card,
return -EINVAL; return -EINVAL;
} }
card->options.layer = discipline;
return 0; return 0;
} }
...@@ -5623,6 +5624,7 @@ void qeth_core_free_discipline(struct qeth_card *card) ...@@ -5623,6 +5624,7 @@ void qeth_core_free_discipline(struct qeth_card *card)
symbol_put(qeth_l2_discipline); symbol_put(qeth_l2_discipline);
else else
symbol_put(qeth_l3_discipline); symbol_put(qeth_l3_discipline);
card->options.layer = QETH_DISCIPLINE_UNDETERMINED;
card->discipline = NULL; card->discipline = NULL;
} }
......
...@@ -432,8 +432,6 @@ static ssize_t qeth_dev_layer2_store(struct device *dev, ...@@ -432,8 +432,6 @@ static ssize_t qeth_dev_layer2_store(struct device *dev,
card->discipline->remove(card->gdev); card->discipline->remove(card->gdev);
qeth_core_free_discipline(card); qeth_core_free_discipline(card);
card->options.layer = QETH_DISCIPLINE_UNDETERMINED;
free_netdev(card->dev); free_netdev(card->dev);
card->dev = ndev; card->dev = ndev;
} }
......
...@@ -806,7 +806,6 @@ static int qeth_l2_probe_device(struct ccwgroup_device *gdev) ...@@ -806,7 +806,6 @@ static int qeth_l2_probe_device(struct ccwgroup_device *gdev)
} }
INIT_LIST_HEAD(&card->vid_list); INIT_LIST_HEAD(&card->vid_list);
hash_init(card->mac_htable); hash_init(card->mac_htable);
card->options.layer = QETH_DISCIPLINE_LAYER2;
card->info.hwtrap = 0; card->info.hwtrap = 0;
qeth_l2_vnicc_set_defaults(card); qeth_l2_vnicc_set_defaults(card);
return 0; return 0;
......
...@@ -2489,7 +2489,6 @@ static int qeth_l3_probe_device(struct ccwgroup_device *gdev) ...@@ -2489,7 +2489,6 @@ static int qeth_l3_probe_device(struct ccwgroup_device *gdev)
} }
hash_init(card->ip_htable); hash_init(card->ip_htable);
hash_init(card->ip_mc_htable); hash_init(card->ip_mc_htable);
card->options.layer = QETH_DISCIPLINE_LAYER3;
card->info.hwtrap = 0; card->info.hwtrap = 0;
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment