From 7da2f3791494b3b0f1514b6e8e632fe67b7b6faf Mon Sep 17 00:00:00 2001 From: Martyn Welch Date: Wed, 5 Aug 2009 17:38:31 +0100 Subject: [PATCH] --- yaml --- r: 162339 b: refs/heads/master c: df45517536eb010ce2b3c4c7b75c1a02bdb10018 h: refs/heads/master i: 162337: 24bd94e4b77eb3d8f6ed7e8321d13dc7d49074f9 162335: c7c521a303e69dd268cc7024f21e2dfa7f953979 v: v3 --- [refs] | 2 +- trunk/drivers/staging/vme/bridges/vme_tsi148.c | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 7db4a8662c47..22bfd19e887a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c7ef5da35a5323bf1375eea4dd8e455c0696b206 +refs/heads/master: df45517536eb010ce2b3c4c7b75c1a02bdb10018 diff --git a/trunk/drivers/staging/vme/bridges/vme_tsi148.c b/trunk/drivers/staging/vme/bridges/vme_tsi148.c index ad6fc2db4379..cdc291989391 100644 --- a/trunk/drivers/staging/vme/bridges/vme_tsi148.c +++ b/trunk/drivers/staging/vme/bridges/vme_tsi148.c @@ -484,21 +484,22 @@ void tsi148_free_irq(int level, int statid) /* Get semaphore */ down(&(vme_irq)); - tsi148_bridge->irq[level - 1].callback[statid].func = NULL; - tsi148_bridge->irq[level - 1].callback[statid].priv_data = NULL; tsi148_bridge->irq[level - 1].count--; - /* Disable IRQ level */ + /* Disable IRQ level if no more interrupts attached at this level*/ if (tsi148_bridge->irq[level - 1].count == 0) { - tmp = ioread32be(tsi148_bridge->base + TSI148_LCSR_INTEO); - tmp &= ~TSI148_LCSR_INTEO_IRQEO[level - 1]; - iowrite32be(tmp, tsi148_bridge->base + TSI148_LCSR_INTEO); - tmp = ioread32be(tsi148_bridge->base + TSI148_LCSR_INTEN); tmp &= ~TSI148_LCSR_INTEN_IRQEN[level - 1]; iowrite32be(tmp, tsi148_bridge->base + TSI148_LCSR_INTEN); + + tmp = ioread32be(tsi148_bridge->base + TSI148_LCSR_INTEO); + tmp &= ~TSI148_LCSR_INTEO_IRQEO[level - 1]; + iowrite32be(tmp, tsi148_bridge->base + TSI148_LCSR_INTEO); } + tsi148_bridge->irq[level - 1].callback[statid].func = NULL; + tsi148_bridge->irq[level - 1].callback[statid].priv_data = NULL; + /* Release semaphore */ up(&(vme_irq)); }