Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 228097
b: refs/heads/master
c: b558ba2
h: refs/heads/master
i:
  228095: f7e67f0
v: v3
  • Loading branch information
Emilio G. Cota authored and Greg Kroah-Hartman committed Nov 16, 2010
1 parent 3553ebf commit 94ebe67
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: db6d8fc5596ef866e64e9a7eef96bacdc6e51e11
refs/heads/master: b558ba2f356c28269de179c4f7f6f179a4fa6a1d
7 changes: 4 additions & 3 deletions trunk/drivers/staging/vme/bridges/vme_tsi148.c
Original file line number Diff line number Diff line change
Expand Up @@ -2531,6 +2531,7 @@ static int tsi148_probe(struct pci_dev *pdev, const struct pci_device_id *id)
static void tsi148_remove(struct pci_dev *pdev)
{
struct list_head *pos = NULL;
struct list_head *tmplist;
struct vme_master_resource *master_image;
struct vme_slave_resource *slave_image;
struct vme_dma_resource *dma_ctrlr;
Expand Down Expand Up @@ -2589,21 +2590,21 @@ static void tsi148_remove(struct pci_dev *pdev)
tsi148_crcsr_exit(tsi148_bridge, pdev);

/* resources are stored in link list */
list_for_each(pos, &tsi148_bridge->dma_resources) {
list_for_each_safe(pos, tmplist, &tsi148_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, &tsi148_bridge->slave_resources) {
list_for_each_safe(pos, tmplist, &tsi148_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, &tsi148_bridge->master_resources) {
list_for_each_safe(pos, tmplist, &tsi148_bridge->master_resources) {
master_image = list_entry(pos, struct vme_master_resource,
list);
list_del(pos);
Expand Down

0 comments on commit 94ebe67

Please sign in to comment.