diff --git a/[refs] b/[refs]
index f3d4b837a915..9af5580e8cf2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c3e6d407c0c09fb46a391bdd0a28827472825de7
+refs/heads/master: 24996edce547fd981c089db9a12717fd76a51160
diff --git a/trunk/drivers/s390/block/scm_drv.c b/trunk/drivers/s390/block/scm_drv.c
index 349966f6fc52..9fa0a908607b 100644
--- a/trunk/drivers/s390/block/scm_drv.c
+++ b/trunk/drivers/s390/block/scm_drv.c
@@ -52,8 +52,8 @@ static int scm_remove(struct scm_device *scmdev)
 {
 	struct scm_blk_dev *bdev = dev_get_drvdata(&scmdev->dev);
 
-	dev_set_drvdata(&scmdev->dev, NULL);
 	scm_blk_dev_cleanup(bdev);
+	dev_set_drvdata(&scmdev->dev, NULL);
 	kfree(bdev);
 
 	return 0;