diff --git a/[refs] b/[refs]
index 37662cf59419..603a42554157 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a3ae39c060be57a4936d2c1d970e4d0c7d320d9c
+refs/heads/master: 39ccf95e28765a08a9e01be614695d7c570b4e77
diff --git a/trunk/drivers/s390/block/dasd.c b/trunk/drivers/s390/block/dasd.c
index a3bfebcf31ef..cfb1fff3787c 100644
--- a/trunk/drivers/s390/block/dasd.c
+++ b/trunk/drivers/s390/block/dasd.c
@@ -314,6 +314,11 @@ dasd_increase_state(struct dasd_device *device)
 	    device->target >= DASD_STATE_READY)
 		rc = dasd_state_basic_to_ready(device);
 
+	if (!rc &&
+	    device->state == DASD_STATE_UNFMT &&
+	    device->target > DASD_STATE_UNFMT)
+		rc = -EPERM;
+
 	if (!rc &&
 	    device->state == DASD_STATE_READY &&
 	    device->target >= DASD_STATE_ONLINE)