diff options
| author | Mark Brown <broonie@kernel.org> | 2018-09-06 10:40:13 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-09-06 10:40:13 +0100 |
| commit | 82eacc8a7bb8eb5809ef9ad8fae8104110626305 (patch) | |
| tree | d507c4402d79f6b6e7841ae9a15612307cb0f049 /drivers/s390 | |
| parent | 3a9cbd70c74f3a4afc78f898f7f95519ef5c5477 (diff) | |
| parent | 4d9339a1f0e6e288903d34020f2378d250ea3cac (diff) | |
Merge tag 'v4.4.154' into linux-linaro-lsk-v4.4
This is the 4.4.154 stable release
Diffstat (limited to 'drivers/s390')
| -rw-r--r-- | drivers/s390/cio/qdio_main.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/s390/cio/qdio_main.c b/drivers/s390/cio/qdio_main.c index 742ca57ece8c..d64b401f3d05 100644 --- a/drivers/s390/cio/qdio_main.c +++ b/drivers/s390/cio/qdio_main.c @@ -640,21 +640,20 @@ static inline unsigned long qdio_aob_for_buffer(struct qdio_output_q *q, unsigned long phys_aob = 0; if (!q->use_cq) - goto out; + return 0; if (!q->aobs[bufnr]) { struct qaob *aob = qdio_allocate_aob(); q->aobs[bufnr] = aob; } if (q->aobs[bufnr]) { - q->sbal_state[bufnr].flags = QDIO_OUTBUF_STATE_FLAG_NONE; q->sbal_state[bufnr].aob = q->aobs[bufnr]; q->aobs[bufnr]->user1 = (u64) q->sbal_state[bufnr].user; phys_aob = virt_to_phys(q->aobs[bufnr]); WARN_ON_ONCE(phys_aob & 0xFF); } -out: + q->sbal_state[bufnr].flags = 0; return phys_aob; } |