1 files changed, 10 insertions, 6 deletions

diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c
index 1a41ef496338..a2edf2a7ace9 100644
--- a/drivers/s390/block/dasd_eckd.c
+++ b/drivers/s390/block/dasd_eckd.c
@@ -531,10 +531,12 @@ static int prefix_LRE(struct ccw1 *ccw, struct PFX_eckd_data *pfxdata,
         pfxdata->validity.define_extent = 1;
 
         /* private uid is kept up to date, conf_data may be outdated */
-        if (startpriv->uid.type != UA_BASE_DEVICE) {
+        if (startpriv->uid.type == UA_BASE_PAV_ALIAS)
                 pfxdata->validity.verify_base = 1;
-                if (startpriv->uid.type == UA_HYPER_PAV_ALIAS)
-                        pfxdata->validity.hyper_pav = 1;
+
+        if (startpriv->uid.type == UA_HYPER_PAV_ALIAS) {
+                pfxdata->validity.verify_base = 1;
+                pfxdata->validity.hyper_pav = 1;
         }
 
         rc = define_extent(NULL, dedata, trk, totrk, cmd, basedev, blksize);
@@ -3415,10 +3417,12 @@ static int prepare_itcw(struct itcw *itcw,
         pfxdata.validity.define_extent = 1;
 
         /* private uid is kept up to date, conf_data may be outdated */
-        if (startpriv->uid.type != UA_BASE_DEVICE) {
+        if (startpriv->uid.type == UA_BASE_PAV_ALIAS)
+                pfxdata.validity.verify_base = 1;
+
+        if (startpriv->uid.type == UA_HYPER_PAV_ALIAS) {
                 pfxdata.validity.verify_base = 1;
-                if (startpriv->uid.type == UA_HYPER_PAV_ALIAS)
-                        pfxdata.validity.hyper_pav = 1;
+                pfxdata.validity.hyper_pav = 1;
         }
 
         switch (cmd) {