Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec6674c6 authored by Eugene Crosser's avatar Eugene Crosser Committed by David S. Miller
Browse files

s390/qdio: fix WARN_ON_ONCE condition 



If HiperSockets Completion Queueing is enabled, qdio always
issues a warning, since the condition is always met.
This patch fixes the condition in WARN_ON_ONCE that was always
true.

Signed-off-by: default avatarEugene Crosser <Eugene.Crosser@ru.ibm.com>
Signed-off-by: default avatarUrsula Braun <ursula.braun@de.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fe5c8028

drivers/s390/cio/qdio_main.c

+2 −2
Original line number Diff line number Diff line
@@ -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 */