diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index aa95f10..80e45de 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -1099,11 +1099,20 @@
 	cqr = (struct dasd_ccw_req *) intparm;
 	if (!cqr || ((scsw_cc(&irb->scsw) == 1) &&
 		     (scsw_fctl(&irb->scsw) & SCSW_FCTL_START_FUNC) &&
-		     (scsw_stctl(&irb->scsw) & SCSW_STCTL_STATUS_PEND))) {
+		     ((scsw_stctl(&irb->scsw) == SCSW_STCTL_STATUS_PEND) ||
+		      (scsw_stctl(&irb->scsw) == (SCSW_STCTL_STATUS_PEND |
+						  SCSW_STCTL_ALERT_STATUS))))) {
 		if (cqr && cqr->status == DASD_CQR_IN_IO)
 			cqr->status = DASD_CQR_QUEUED;
+		if (cqr)
+			memcpy(&cqr->irb, irb, sizeof(*irb));
 		device = dasd_device_from_cdev_locked(cdev);
 		if (!IS_ERR(device)) {
+			device->discipline->dump_sense_dbf(device, irb,
+							   "unsolicited");
+			if ((device->features & DASD_FEATURE_ERPLOG))
+				device->discipline->dump_sense(device, cqr,
+							       irb);
 			dasd_device_clear_timer(device);
 			device->discipline->handle_unsolicited_interrupt(device,
 									 irb);