summaryrefslogtreecommitdiffstats
path: root/drivers/s390/cio/device.c
diff options
context:
space:
mode:
authorSebastian Ott <sebott@linux.vnet.ibm.com>2015-09-15 13:11:42 +0200
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2015-10-14 14:32:02 +0200
commit1bc6664bdfb949bc69a08113801e7d6acbf6bc3f (patch)
tree5426526ca602c9394d3501cf15cf61fa5acc2695 /drivers/s390/cio/device.c
parent279b8f9a0f3ea3399764047d487dfdd8f7bc9795 (diff)
downloadtalos-obmc-linux-1bc6664bdfb949bc69a08113801e7d6acbf6bc3f.tar.gz
talos-obmc-linux-1bc6664bdfb949bc69a08113801e7d6acbf6bc3f.zip
s390/cio: use device_lock during cmb activation
Hold the device_lock during [de]activation of the channel measurement block to synchronize concurrent usage of these functions. Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com> Reviewed-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'drivers/s390/cio/device.c')
-rw-r--r--drivers/s390/cio/device.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index dfef5e63cb7b..20b92c703944 100644
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -1797,7 +1797,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)
OpenPOWER on IntegriCloud