Commit b49c32ba authored by Wei Yongjun's avatar Wei Yongjun Committed by Greg Kroah-Hartman

vme: vme_tsi148.c: fix to use list_for_each_safe() when delete list items

Since we will be removing items off the list using list_del() we need
to use a safer version of the list_for_each() macro aptly named
list_for_each_safe().
Signed-off-by: default avatarWei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1b8cb929
...@@ -2350,7 +2350,7 @@ static int tsi148_probe(struct pci_dev *pdev, const struct pci_device_id *id) ...@@ -2350,7 +2350,7 @@ static int tsi148_probe(struct pci_dev *pdev, const struct pci_device_id *id)
{ {
int retval, i, master_num; int retval, i, master_num;
u32 data; u32 data;
struct list_head *pos = NULL; struct list_head *pos = NULL, *n;
struct vme_bridge *tsi148_bridge; struct vme_bridge *tsi148_bridge;
struct tsi148_driver *tsi148_device; struct tsi148_driver *tsi148_device;
struct vme_master_resource *master_image; struct vme_master_resource *master_image;
...@@ -2615,28 +2615,28 @@ static int tsi148_probe(struct pci_dev *pdev, const struct pci_device_id *id) ...@@ -2615,28 +2615,28 @@ static int tsi148_probe(struct pci_dev *pdev, const struct pci_device_id *id)
err_crcsr: err_crcsr:
err_lm: err_lm:
/* resources are stored in link list */ /* 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); lm = list_entry(pos, struct vme_lm_resource, list);
list_del(pos); list_del(pos);
kfree(lm); kfree(lm);
} }
err_dma: err_dma:
/* resources are stored in link list */ /* 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); dma_ctrlr = list_entry(pos, struct vme_dma_resource, list);
list_del(pos); list_del(pos);
kfree(dma_ctrlr); kfree(dma_ctrlr);
} }
err_slave: err_slave:
/* resources are stored in link list */ /* 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); slave_image = list_entry(pos, struct vme_slave_resource, list);
list_del(pos); list_del(pos);
kfree(slave_image); kfree(slave_image);
} }
err_master: err_master:
/* resources are stored in link list */ /* 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, master_image = list_entry(pos, struct vme_master_resource,
list); list);
list_del(pos); list_del(pos);
......
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