Merge v4.20-rc4 into drm-next

Requested by Boris Brezillon for some vc4 fixes that are needed for future vc4 work.

Signed-off-by: Dave Airlie <airlied@redhat.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/s390/net/ism_drv.c b/drivers/s390/net/ism_drv.c
index f96ec68af2e5..dcbf5c857743 100644
--- a/drivers/s390/net/ism_drv.c
+++ b/drivers/s390/net/ism_drv.c
@@ -415,9 +415,9 @@ static irqreturn_t ism_handle_irq(int irq, void *data)
                         break;
 
                 clear_bit_inv(bit, bv);
+                ism->sba->dmbe_mask[bit + ISM_DMB_BIT_OFFSET] = 0;
                 barrier();
                 smcd_handle_irq(ism->smcd, bit + ISM_DMB_BIT_OFFSET);
-                ism->sba->dmbe_mask[bit + ISM_DMB_BIT_OFFSET] = 0;
         }
 
         if (ism->sba->e) {