diff options
| author | Tomas Winkler <tomas.winkler@intel.com> | 2016-11-11 03:00:07 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-11-15 10:56:52 +0100 |
| commit | 17ba8a08b58a01bbac35790ffca4388ca92b7790 (patch) | |
| tree | 856d163b16e05878fc9bc5b5e576b34a3e25e93f | |
| parent | c836790ae55b854af0e95fce1349ef68f543b79b (diff) | |
| download | linux-stable-17ba8a08b58a01bbac35790ffca4388ca92b7790.tar.gz linux-stable-17ba8a08b58a01bbac35790ffca4388ca92b7790.tar.bz2 linux-stable-17ba8a08b58a01bbac35790ffca4388ca92b7790.zip | |
mei: consolidate repeating code in mei_cl_irq_read_msg
A cb is always placed on the completion queue
during discarding queue. Hence this can be performed
upon discard.
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/misc/mei/interrupt.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/misc/mei/interrupt.c b/drivers/misc/mei/interrupt.c index 5a4893ce9c24..b584749bcc4a 100644 --- a/drivers/misc/mei/interrupt.c +++ b/drivers/misc/mei/interrupt.c @@ -118,7 +118,6 @@ int mei_cl_irq_read_msg(struct mei_cl *cl, if (!mei_cl_is_connected(cl)) { cl_dbg(dev, cl, "not connected\n"); - list_move_tail(&cb->list, &complete_list->list); cb->status = -ENODEV; goto discard; } @@ -128,8 +127,6 @@ int mei_cl_irq_read_msg(struct mei_cl *cl, if (buf_sz < cb->buf_idx) { cl_err(dev, cl, "message is too big len %d idx %zu\n", mei_hdr->length, cb->buf_idx); - - list_move_tail(&cb->list, &complete_list->list); cb->status = -EMSGSIZE; goto discard; } @@ -137,8 +134,6 @@ int mei_cl_irq_read_msg(struct mei_cl *cl, if (cb->buf.size < buf_sz) { cl_dbg(dev, cl, "message overflow. size %zu len %d idx %zu\n", cb->buf.size, mei_hdr->length, cb->buf_idx); - - list_move_tail(&cb->list, &complete_list->list); cb->status = -EMSGSIZE; goto discard; } @@ -158,6 +153,8 @@ int mei_cl_irq_read_msg(struct mei_cl *cl, return 0; discard: + if (cb) + list_move_tail(&cb->list, &complete_list->list); mei_irq_discard_msg(dev, mei_hdr); return 0; } |