Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 162342
b: refs/heads/master
c: 7515502
h: refs/heads/master
v: v3
  • Loading branch information
Martyn Welch authored and Greg Kroah-Hartman committed Sep 15, 2009
1 parent ac327be commit 60493df
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 51a569f757f233bcffbffcdfeeff510916991a55
refs/heads/master: 75155020c8dc3aa38f8cabc95f17ccd8389c37b6
5 changes: 5 additions & 0 deletions trunk/drivers/staging/vme/bridges/vme_tsi148.c
Original file line number Diff line number Diff line change
Expand Up @@ -480,6 +480,7 @@ int tsi148_request_irq(int level, int statid,
void tsi148_free_irq(int level, int statid)
{
u32 tmp;
struct pci_dev *pdev;

/* Get semaphore */
down(&(vme_irq));
Expand All @@ -495,6 +496,10 @@ void tsi148_free_irq(int level, int statid)
tmp = ioread32be(tsi148_bridge->base + TSI148_LCSR_INTEO);
tmp &= ~TSI148_LCSR_INTEO_IRQEO[level - 1];
iowrite32be(tmp, tsi148_bridge->base + TSI148_LCSR_INTEO);

pdev = container_of(tsi148_bridge->parent, struct pci_dev, dev);

synchronize_irq(pdev->irq);
}

tsi148_bridge->irq[level - 1].callback[statid].func = NULL;
Expand Down

0 comments on commit 60493df

Please sign in to comment.