|
@@ -2350,7 +2350,7 @@ static int tsi148_probe(struct pci_dev *pdev, const struct pci_device_id *id)
|
|
|
{
|
|
|
int retval, i, master_num;
|
|
|
u32 data;
|
|
|
- struct list_head *pos = NULL;
|
|
|
+ struct list_head *pos = NULL, *n;
|
|
|
struct vme_bridge *tsi148_bridge;
|
|
|
struct tsi148_driver *tsi148_device;
|
|
|
struct vme_master_resource *master_image;
|
|
@@ -2615,28 +2615,28 @@ err_reg:
|
|
|
err_crcsr:
|
|
|
err_lm:
|
|
|
/* resources are stored in link list */
|
|
|
- list_for_each(pos, &tsi148_bridge->lm_resources) {
|
|
|
+ list_for_each_safe(pos, n, &tsi148_bridge->lm_resources) {
|
|
|
lm = list_entry(pos, struct vme_lm_resource, list);
|
|
|
list_del(pos);
|
|
|
kfree(lm);
|
|
|
}
|
|
|
err_dma:
|
|
|
/* resources are stored in link list */
|
|
|
- list_for_each(pos, &tsi148_bridge->dma_resources) {
|
|
|
+ list_for_each_safe(pos, n, &tsi148_bridge->dma_resources) {
|
|
|
dma_ctrlr = list_entry(pos, struct vme_dma_resource, list);
|
|
|
list_del(pos);
|
|
|
kfree(dma_ctrlr);
|
|
|
}
|
|
|
err_slave:
|
|
|
/* resources are stored in link list */
|
|
|
- list_for_each(pos, &tsi148_bridge->slave_resources) {
|
|
|
+ list_for_each_safe(pos, n, &tsi148_bridge->slave_resources) {
|
|
|
slave_image = list_entry(pos, struct vme_slave_resource, list);
|
|
|
list_del(pos);
|
|
|
kfree(slave_image);
|
|
|
}
|
|
|
err_master:
|
|
|
/* resources are stored in link list */
|
|
|
- list_for_each(pos, &tsi148_bridge->master_resources) {
|
|
|
+ list_for_each_safe(pos, n, &tsi148_bridge->master_resources) {
|
|
|
master_image = list_entry(pos, struct vme_master_resource,
|
|
|
list);
|
|
|
list_del(pos);
|