These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / s390 / cio / device.c

diff --git a/kernel/drivers/s390/cio/device.c b/kernel/drivers/s390/cio/device.c
index dfef5e6..6aae684 100644 (file)
--- a/kernel/drivers/s390/cio/device.c
+++ b/kernel/drivers/s390/cio/device.c
@@ -1787,6 +1787,8 @@ static int ccw_device_remove(struct device *dev)
        cdev->drv = NULL;
        cdev->private->int_class = IRQIO_CIO;
        spin_unlock_irq(cdev->ccwlock);
+       __disable_cmf(cdev);
+
        return 0;
 }
 
@@ -1797,7 +1799,7 @@ static void ccw_device_shutdown(struct device *dev)
        cdev = to_ccwdev(dev);
        if (cdev->drv && cdev->drv->shutdown)
                cdev->drv->shutdown(cdev);
-       disable_cmf(cdev);
+       __disable_cmf(cdev);
 }
 
 static int ccw_device_pm_prepare(struct device *dev)