From 281df4b6a6787ed4ace06ac4f727fba5b1eac510 Mon Sep 17 00:00:00 2001 From: Jens Taprogge Date: Wed, 12 Sep 2012 14:55:34 +0200 Subject: [PATCH] --- yaml --- r: 325239 b: refs/heads/master c: 88ff8480d39da6b2961444f0c28b5b0d194d2de6 h: refs/heads/master i: 325237: d21cb85060bc0b8235ff393e9a28c0e627d18cc2 325235: fbf985a8047940e616faa59fd273e777870ae2e9 325231: 0828def48eddf2da627724f57df9beca356dc0b8 v: v3 --- [refs] | 2 +- trunk/drivers/staging/ipack/bridges/tpci200.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 48492cfa0493..630470350a86 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 487e0a608d8d7483be5b5fe3fe9414636c087588 +refs/heads/master: 88ff8480d39da6b2961444f0c28b5b0d194d2de6 diff --git a/trunk/drivers/staging/ipack/bridges/tpci200.c b/trunk/drivers/staging/ipack/bridges/tpci200.c index b1ddbe3ec33a..0cbaf3ab53cd 100644 --- a/trunk/drivers/staging/ipack/bridges/tpci200.c +++ b/trunk/drivers/staging/ipack/bridges/tpci200.c @@ -116,7 +116,6 @@ static irqreturn_t tpci200_interrupt(int irq, void *dev_id) struct tpci200_board *tpci200 = (struct tpci200_board *) dev_id; int i; unsigned short status_reg; - irqreturn_t ret = IRQ_NONE; struct slot_irq *slot_irq; /* Read status register */ @@ -130,7 +129,7 @@ static irqreturn_t tpci200_interrupt(int irq, void *dev_id) continue; slot_irq = rcu_dereference(tpci200->slots[i].irq); if (slot_irq) { - ret = tpci200_slot_irq(slot_irq); + tpci200_slot_irq(slot_irq); } else { dev_info(&tpci200->info->pdev->dev, "No registered ISR for slot [%d:%d]!. IRQ will be disabled.\n", @@ -141,9 +140,11 @@ static irqreturn_t tpci200_interrupt(int irq, void *dev_id) } } rcu_read_unlock(); - } - return ret; + return IRQ_HANDLED; + } else { + return IRQ_NONE; + } } static int tpci200_register(struct tpci200_board *tpci200)