Merge tag 'vfio-v3.14-rc1' of git://github.com/awilliam/linux-vfio

[karo-tx-linux.git] / drivers / vfio / pci / vfio_pci.c

diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c
index 2319d206f63092f7a73d90d6fdb5b36bf4447d5c..7ba0424988573a83109293e4c7e80c5f683deec2 100644 (file)
--- a/drivers/vfio/pci/vfio_pci.c
+++ b/drivers/vfio/pci/vfio_pci.c
@@ -872,9 +872,13 @@ static pci_ers_result_t vfio_pci_aer_err_detected(struct pci_dev *pdev,
                return PCI_ERS_RESULT_DISCONNECT;
        }
 
+       mutex_lock(&vdev->igate);
+
        if (vdev->err_trigger)
                eventfd_signal(vdev->err_trigger, 1);
 
+       mutex_unlock(&vdev->igate);
+
        vfio_device_put(device);
 
        return PCI_ERS_RESULT_CAN_RECOVER;