4 files changed, 16 insertions, 5 deletions

diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index d0647d116eaa..79ffef6bfaf8 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -203,6 +203,7 @@ dasd_state_basic_to_known(struct dasd_device * device)
         rc = dasd_flush_ccw_queue(device, 1);
         if (rc)
                 return rc;
+        dasd_clear_timer(device);
 
         DBF_DEV_EVENT(DBF_EMERG, device, "%p debug area deleted", device);
         if (device->debug_area != NULL) {
diff --git a/drivers/s390/char/monwriter.c b/drivers/s390/char/monwriter.c
index abd02ed501cb..b9b0fc3f812b 100644
--- a/drivers/s390/char/monwriter.c
+++ b/drivers/s390/char/monwriter.c
@@ -73,12 +73,15 @@ static inline struct mon_buf *monwrite_find_hdr(struct mon_private *monpriv,
         struct mon_buf *entry, *next;
 
         list_for_each_entry_safe(entry, next, &monpriv->list, list)
-                if (entry->hdr.applid == monhdr->applid &&
+                if ((entry->hdr.mon_function == monhdr->mon_function ||
+                     monhdr->mon_function == MONWRITE_STOP_INTERVAL) &&
+                    entry->hdr.applid == monhdr->applid &&
                     entry->hdr.record_num == monhdr->record_num &&
                     entry->hdr.version == monhdr->version &&
                     entry->hdr.release == monhdr->release &&
                     entry->hdr.mod_level == monhdr->mod_level)
                         return entry;
+
         return NULL;
 }
 
@@ -92,7 +95,9 @@ static int monwrite_new_hdr(struct mon_private *monpriv)
             monhdr->mon_function > MONWRITE_START_CONFIG ||
             monhdr->hdrlen != sizeof(struct monwrite_hdr))
                 return -EINVAL;
-        monbuf = monwrite_find_hdr(monpriv, monhdr);
+        monbuf = NULL;
+        if (monhdr->mon_function != MONWRITE_GEN_EVENT)
+                monbuf = monwrite_find_hdr(monpriv, monhdr);
         if (monbuf) {
                 if (monhdr->mon_function == MONWRITE_STOP_INTERVAL) {
                         monhdr->datalen = monbuf->hdr.datalen;
@@ -104,7 +109,7 @@ static int monwrite_new_hdr(struct mon_private *monpriv)
                         kfree(monbuf);
                         monbuf = NULL;
                 }
-        } else {
+        } else if (monhdr->mon_function != MONWRITE_STOP_INTERVAL) {
                 if (mon_buf_count >= mon_max_bufs)
                         return -ENOSPC;
                 monbuf = kzalloc(sizeof(struct mon_buf), GFP_KERNEL);
@@ -118,7 +123,8 @@ static int monwrite_new_hdr(struct mon_private *monpriv)
                 }
                 monbuf->hdr = *monhdr;
                 list_add_tail(&monbuf->list, &monpriv->list);
-                mon_buf_count++;
+                if (monhdr->mon_function != MONWRITE_GEN_EVENT)
+                        mon_buf_count++;
         }
         monpriv->current_buf = monbuf;
         return 0;
diff --git a/drivers/s390/cio/device_fsm.c b/drivers/s390/cio/device_fsm.c
index fcaf28d7b4eb..de3d0857db9f 100644
--- a/drivers/s390/cio/device_fsm.c
+++ b/drivers/s390/cio/device_fsm.c
@@ -578,9 +578,13 @@ ccw_device_verify_done(struct ccw_device *cdev, int err)
                 }
                 break;
         case -ETIME:
+                /* Reset oper notify indication after verify error. */
+                cdev->private->flags.donotify = 0;
                 ccw_device_done(cdev, DEV_STATE_BOXED);
                 break;
         default:
+                /* Reset oper notify indication after verify error. */
+                cdev->private->flags.donotify = 0;
                 PREPARE_WORK(&cdev->private->kick_work,
                              ccw_device_nopath_notify, cdev);
                 queue_work(ccw_device_notify_work, &cdev->private->kick_work);
diff --git a/drivers/s390/cio/qdio.c b/drivers/s390/cio/qdio.c
index 0648ce5bb684..476aa1da5cbc 100644
--- a/drivers/s390/cio/qdio.c
+++ b/drivers/s390/cio/qdio.c
@@ -3529,7 +3529,7 @@ do_QDIO(struct ccw_device *cdev,unsigned int callflags,
 #ifdef CONFIG_QDIO_DEBUG
         char dbf_text[20];
 
-        sprintf(dbf_text,"doQD%04x",cdev->private->sch_no);
+        sprintf(dbf_text,"doQD%04x",cdev->private->schid.sch_no);
         QDIO_DBF_TEXT3(0,trace,dbf_text);
 #endif /* CONFIG_QDIO_DEBUG */