2 files changed, 11 insertions, 1 deletions

diff --git a/drivers/s390/block/dasd_alias.c b/drivers/s390/block/dasd_alias.c
index c388eda1e2b1..553b3c5abb0a 100644
--- a/drivers/s390/block/dasd_alias.c
+++ b/drivers/s390/block/dasd_alias.c
@@ -705,6 +705,16 @@ struct dasd_device *dasd_alias_get_start_dev(struct dasd_device *base_device)
         if (lcu->pav == NO_PAV ||
             lcu->flags & (NEED_UAC_UPDATE | UPDATE_PENDING))
                 return NULL;
+        if (unlikely(!(private->features.feature[8] & 0x01))) {
+                /*
+                 * PAV enabled but prefix not, very unlikely
+                 * seems to be a lost pathgroup
+                 * use base device to do IO
+                 */
+                DBF_DEV_EVENT(DBF_ERR, base_device, "%s",
+                              "Prefix not enabled with PAV enabled\n");
+                return NULL;
+        }
 
         spin_lock_irqsave(&lcu->lock, flags);
         alias_device = group->next;
diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c
index 763f1bd9605a..bbcd5e9206ee 100644
--- a/drivers/s390/block/dasd_eckd.c
+++ b/drivers/s390/block/dasd_eckd.c
@@ -2397,7 +2397,7 @@ static struct dasd_ccw_req *dasd_eckd_build_cp_cmd_single(
                                            sizeof(struct PFX_eckd_data));
         } else {
                 if (define_extent(ccw++, cqr->data, first_trk,
-                                  last_trk, cmd, startdev) == -EAGAIN) {
+                                  last_trk, cmd, basedev) == -EAGAIN) {
                         /* Clock not in sync and XRC is enabled.
                          * Try again later.
                          */