| From ee2d6a9badf56450d500324a70c8b7e9583a3315 Mon Sep 17 00:00:00 2001 |
| From: Julian Wiedmann <jwi@linux.ibm.com> |
| Date: Mon, 4 Feb 2019 17:40:06 +0100 |
| Subject: s390/qeth: release cmd buffer in error paths |
| |
| [ Upstream commit 5065b2dd3e5f9247a6c9d67974bc0472bf561b9d ] |
| |
| Whenever we fail before/while starting an IO, make sure to release the |
| IO buffer. Usually qeth_irq() would do this for us, but if the IO |
| doesn't even start we obviously won't get an interrupt for it either. |
| |
| Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/s390/net/qeth_core_main.c | 6 ++++++ |
| 1 file changed, 6 insertions(+) |
| |
| diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c |
| index b03515d43745..4b3b9c4e46d2 100644 |
| --- a/drivers/s390/net/qeth_core_main.c |
| +++ b/drivers/s390/net/qeth_core_main.c |
| @@ -565,6 +565,7 @@ static int __qeth_issue_next_read(struct qeth_card *card) |
| QETH_DBF_MESSAGE(2, "%s error in starting next read ccw! " |
| "rc=%i\n", dev_name(&card->gdev->dev), rc); |
| atomic_set(&channel->irq_pending, 0); |
| + qeth_release_buffer(channel, iob); |
| card->read_or_write_problem = 1; |
| qeth_schedule_recovery(card); |
| wake_up(&card->wait_q); |
| @@ -1187,6 +1188,8 @@ static void qeth_irq(struct ccw_device *cdev, unsigned long intparm, |
| rc = qeth_get_problem(cdev, irb); |
| if (rc) { |
| card->read_or_write_problem = 1; |
| + if (iob) |
| + qeth_release_buffer(iob->channel, iob); |
| qeth_clear_ipacmd_list(card); |
| qeth_schedule_recovery(card); |
| goto out; |
| @@ -1852,6 +1855,7 @@ static int qeth_idx_activate_get_answer(struct qeth_channel *channel, |
| QETH_DBF_MESSAGE(2, "Error2 in activating channel rc=%d\n", rc); |
| QETH_DBF_TEXT_(SETUP, 2, "2err%d", rc); |
| atomic_set(&channel->irq_pending, 0); |
| + qeth_release_buffer(channel, iob); |
| wake_up(&card->wait_q); |
| return rc; |
| } |
| @@ -1923,6 +1927,7 @@ static int qeth_idx_activate_channel(struct qeth_channel *channel, |
| rc); |
| QETH_DBF_TEXT_(SETUP, 2, "1err%d", rc); |
| atomic_set(&channel->irq_pending, 0); |
| + qeth_release_buffer(channel, iob); |
| wake_up(&card->wait_q); |
| return rc; |
| } |
| @@ -2110,6 +2115,7 @@ int qeth_send_control_data(struct qeth_card *card, int len, |
| } |
| reply = qeth_alloc_reply(card); |
| if (!reply) { |
| + qeth_release_buffer(channel, iob); |
| return -ENOMEM; |
| } |
| reply->callback = reply_cb; |
| -- |
| 2.19.1 |
| |