From: Ben Hutchings Date: Sun, 2 Jun 2013 02:34:36 +0000 (+0100) Subject: rapidio/tsi721: Fix interrupt mask when handling MSI X-Git-Tag: v3.4.92~22 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=06b08fa44855ef1f292ba720a74e9f8dc07f52eb;p=thirdparty%2Fkernel%2Fstable.git rapidio/tsi721: Fix interrupt mask when handling MSI commit 94e0104bca7d6927e85119030b8e6e31fde88a7a upstream. Commit 1619f441963e 'rapidio/tsi721: fix bug in MSI interrupt handling' (commit 1ccc819da6fd upstream) makes the MSI handler disable and re-enable interrupts. When re-enabling interrupts, we should set the same flags as were originally set, but this changed in Linux 3.5 so the flags are now inconsistent in 3.2. In fact, the extra flag isn't even defined in 3.2. Remove the extra flag from the MSI handler. Reported-by: Steve Conklin Signed-off-by: Ben Hutchings Cc: Qiang Huang Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/rapidio/devices/tsi721.c b/drivers/rapidio/devices/tsi721.c index 23ef16c94ca54..84eab3fa9bca7 100644 --- a/drivers/rapidio/devices/tsi721.c +++ b/drivers/rapidio/devices/tsi721.c @@ -555,7 +555,7 @@ static irqreturn_t tsi721_irqhandler(int irq, void *ptr) /* For MSI mode re-enable device-level interrupts */ if (priv->flags & TSI721_USING_MSI) { dev_int = TSI721_DEV_INT_SR2PC_CH | TSI721_DEV_INT_SRIO | - TSI721_DEV_INT_SMSG_CH | TSI721_DEV_INT_BDMA_CH; + TSI721_DEV_INT_SMSG_CH; iowrite32(dev_int, priv->regs + TSI721_DEV_INTE); }