rapidio/tsi721: Fix interrupt mask when handling MSI
authorBen Hutchings <ben@decadent.org.uk>
Sun, 2 Jun 2013 02:34:36 +0000 (03:34 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 7 Jun 2014 23:02:14 +0000 (16:02 -0700)
commit06b08fa44855ef1f292ba720a74e9f8dc07f52eb
tree242165696da93e473a6d02bc12cbbab6ac7a6447
parent13bbf8c9ea7e22f1ddeb73d0e2e3876ae59b036d
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 <steve.conklin@canonical.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Cc: Qiang Huang <h.huangqiang@huawei.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/rapidio/devices/tsi721.c