Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / s390 / block / dasd_erp.c

diff --git a/drivers/s390/block/dasd_erp.c b/drivers/s390/block/dasd_erp.c
index 7656384a811d2b8a451757be6b7fb48e3e792483..0eafe2e421e7dfadccdcb0f087ab80605ccd4d24 100644 (file)
--- a/drivers/s390/block/dasd_erp.c
+++ b/drivers/s390/block/dasd_erp.c
@@ -96,7 +96,8 @@ dasd_default_erp_action(struct dasd_ccw_req *cqr)
                DBF_DEV_EVENT(DBF_DEBUG, device,
                              "default ERP called (%i retries left)",
                              cqr->retries);
-               cqr->lpm    = LPM_ANYPATH;
+               if (!test_bit(DASD_CQR_VERIFY_PATH, &cqr->flags))
+                       cqr->lpm = device->path_data.opm;
                cqr->status = DASD_CQR_FILLED;
         } else {
                pr_err("%s: default ERP has run out of retries and failed\n",