Merge branch 'next/drivers' into HEAD

[deliverable/linux.git] / drivers / vme / bridges / vme_ca91cx42.c

diff --git a/drivers/vme/bridges/vme_ca91cx42.c b/drivers/vme/bridges/vme_ca91cx42.c
index e0df92ec44bd09e31b36eac563c0b3b965cde154..1425d22cf956342fe61d522cc0fd27531cb96333 100644 (file)
--- a/drivers/vme/bridges/vme_ca91cx42.c
+++ b/drivers/vme/bridges/vme_ca91cx42.c
@@ -1603,7 +1603,7 @@ static int ca91cx42_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 {
        int retval, i;
        u32 data;
-       struct list_head *pos = NULL;
+       struct list_head *pos = NULL, *n;
        struct vme_bridge *ca91cx42_bridge;
        struct ca91cx42_driver *ca91cx42_device;
        struct vme_master_resource *master_image;
@@ -1821,28 +1821,28 @@ err_reg:
        ca91cx42_crcsr_exit(ca91cx42_bridge, pdev);
 err_lm:
        /* resources are stored in link list */
-       list_for_each(pos, &ca91cx42_bridge->lm_resources) {
+       list_for_each_safe(pos, n, &ca91cx42_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, &ca91cx42_bridge->dma_resources) {
+       list_for_each_safe(pos, n, &ca91cx42_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, &ca91cx42_bridge->slave_resources) {
+       list_for_each_safe(pos, n, &ca91cx42_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, &ca91cx42_bridge->master_resources) {
+       list_for_each_safe(pos, n, &ca91cx42_bridge->master_resources) {
                master_image = list_entry(pos, struct vme_master_resource,
                        list);
                list_del(pos);
@@ -1868,7 +1868,7 @@ err_struct:
 
 static void ca91cx42_remove(struct pci_dev *pdev)
 {
-       struct list_head *pos = NULL;
+       struct list_head *pos = NULL, *n;
        struct vme_master_resource *master_image;
        struct vme_slave_resource *slave_image;
        struct vme_dma_resource *dma_ctrlr;
@@ -1905,28 +1905,28 @@ static void ca91cx42_remove(struct pci_dev *pdev)
        ca91cx42_crcsr_exit(ca91cx42_bridge, pdev);
 
        /* resources are stored in link list */
-       list_for_each(pos, &ca91cx42_bridge->lm_resources) {
+       list_for_each_safe(pos, n, &ca91cx42_bridge->lm_resources) {
                lm = list_entry(pos, struct vme_lm_resource, list);
                list_del(pos);
                kfree(lm);
        }
 
        /* resources are stored in link list */
-       list_for_each(pos, &ca91cx42_bridge->dma_resources) {
+       list_for_each_safe(pos, n, &ca91cx42_bridge->dma_resources) {
                dma_ctrlr = list_entry(pos, struct vme_dma_resource, list);
                list_del(pos);
                kfree(dma_ctrlr);
        }
 
        /* resources are stored in link list */
-       list_for_each(pos, &ca91cx42_bridge->slave_resources) {
+       list_for_each_safe(pos, n, &ca91cx42_bridge->slave_resources) {
                slave_image = list_entry(pos, struct vme_slave_resource, list);
                list_del(pos);
                kfree(slave_image);
        }
 
        /* resources are stored in link list */
-       list_for_each(pos, &ca91cx42_bridge->master_resources) {
+       list_for_each_safe(pos, n, &ca91cx42_bridge->master_resources) {
                master_image = list_entry(pos, struct vme_master_resource,
                        list);
                list_del(pos);