summaryrefslogtreecommitdiffstats
path: root/drivers/thunderbolt
diff options
context:
space:
mode:
authorMika Westerberg <mika.westerberg@linux.intel.com>2017-12-01 15:08:05 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-12-16 16:37:51 +0100
commit74657181e7c449351d1ad28cf43941bc333e1bd6 (patch)
tree6150e8f77e0b5bbd40714db2044787d5a0bf5c65 /drivers/thunderbolt
parent78dfa29c84bab548910490cf7508c53ad99d1d9e (diff)
downloadlinux-74657181e7c449351d1ad28cf43941bc333e1bd6.tar.gz
linux-74657181e7c449351d1ad28cf43941bc333e1bd6.tar.bz2
linux-74657181e7c449351d1ad28cf43941bc333e1bd6.zip
thunderbolt: Mask ring interrupt properly when polling starts
When ring enters polling mode we are expected to mask the ring interrupt before the callback is called. However, the current code actually unmasks it probably because of a copy-paste mistake. Mask the interrupt properly from now on. Fixes: 4ffe722eefcb ("thunderbolt: Add polling mode for rings") Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com> Acked-by: Yehezkel Bernat <yehezkel.bernat@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/thunderbolt')
-rw-r--r--drivers/thunderbolt/nhi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/thunderbolt/nhi.c b/drivers/thunderbolt/nhi.c
index 419a7a90bce0..f45bcbc63738 100644
--- a/drivers/thunderbolt/nhi.c
+++ b/drivers/thunderbolt/nhi.c
@@ -339,7 +339,7 @@ static void __ring_interrupt(struct tb_ring *ring)
return;
if (ring->start_poll) {
- __ring_interrupt_mask(ring, false);
+ __ring_interrupt_mask(ring, true);
ring->start_poll(ring->poll_data);
} else {
schedule_work(&ring->work);