Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc

[powerpc.git] / drivers / s390 / block / dasd_3990_erp.c

diff --git a/drivers/s390/block/dasd_3990_erp.c b/drivers/s390/block/dasd_3990_erp.c
index 4d01040..8b9d68f 100644 (file)
--- a/drivers/s390/block/dasd_3990_erp.c
+++ b/drivers/s390/block/dasd_3990_erp.c
@@ -170,7 +170,6 @@ dasd_3990_erp_examine(struct dasd_ccw_req * cqr, struct irb * irb)
        /* log the erp chain if fatal error occurred */
        if ((era == dasd_era_fatal) && (device->state >= DASD_STATE_READY)) {
                dasd_log_sense(cqr, irb);
-               dasd_log_ccw(cqr, 0, irb->scsw.cpa);
        }
 
        return era;
@@ -2640,7 +2639,6 @@ dasd_3990_erp_action(struct dasd_ccw_req * cqr)
 
        struct dasd_ccw_req *erp = NULL;
        struct dasd_device *device = cqr->device;
-       __u32 cpa = cqr->irb.scsw.cpa;
        struct dasd_ccw_req *temp_erp = NULL;
 
        if (device->features & DASD_FEATURE_ERPLOG) {
@@ -2706,9 +2704,6 @@ dasd_3990_erp_action(struct dasd_ccw_req * cqr)
                }
        }
 
-       if (erp->status == DASD_CQR_FAILED)
-               dasd_log_ccw(erp, 1, cpa);
-
        /* enqueue added ERP request */
        if (erp->status == DASD_CQR_FILLED) {
                erp->status = DASD_CQR_QUEUED;