1 files changed, 2 insertions, 0 deletions

diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index 7fb271c60c27..eea9b1de0af7 100644
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -21,6 +21,7 @@
 #include <asm/ccwdev.h>
 #include <asm/cio.h>
 #include <asm/param.h>          /* HZ */
+#include <asm/cmb.h>
 
 #include "cio.h"
 #include "cio_debug.h"
@@ -1440,6 +1441,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);
 }
 
 struct bus_type ccw_bus_type = {