These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / s390 / cio / qdio_main.c

diff --git a/kernel/drivers/s390/cio/qdio_main.c b/kernel/drivers/s390/cio/qdio_main.c
index 848e3b6..4bb5262 100644 (file)
--- a/kernel/drivers/s390/cio/qdio_main.c
+++ b/kernel/drivers/s390/cio/qdio_main.c
@@ -319,6 +319,8 @@ static int qdio_siga_output(struct qdio_q *q, unsigned int *busy_bit,
        int retries = 0, cc;
        unsigned long laob = 0;
 
+       WARN_ON_ONCE(aob && ((queue_type(q) != QDIO_IQDIO_QFMT) ||
+                            !q->u.out.use_cq));
        if (q->u.out.use_cq && aob != 0) {
                fc = QDIO_SIGA_WRITEQ;
                laob = aob;
@@ -329,8 +331,6 @@ static int qdio_siga_output(struct qdio_q *q, unsigned int *busy_bit,
                fc |= QDIO_SIGA_QEBSM_FLAG;
        }
 again:
-       WARN_ON_ONCE((aob && queue_type(q) != QDIO_IQDIO_QFMT) ||
-               (aob && fc != QDIO_SIGA_WRITEQ));
        cc = do_siga_output(schid, q->mask, busy_bit, fc, laob);
 
        /* hipersocket busy condition */