Commit f7935e33 authored by Alex Elder's avatar Alex Elder Committed by Greg Kroah-Hartman

greybus: use null gbuf->transfer_buffer

Make sure gbuf->transfer_buffer gets reset to NULL when the buffer
is freed.  We can leverage that to do a little extra error checking.
We'll also use a null transfer buffer in the next patch to indicate
an unused gbuf.
Signed-off-by: default avatarAlex Elder <elder@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <greg@kroah.com>
parent bb88896e
...@@ -99,6 +99,9 @@ static int alloc_gbuf_data(struct gbuf *gbuf, unsigned int size, ...@@ -99,6 +99,9 @@ static int alloc_gbuf_data(struct gbuf *gbuf, unsigned int size,
u32 cport_reserve = gbuf->dest_cport_id == CPORT_ID_BAD ? 0 : 1; u32 cport_reserve = gbuf->dest_cport_id == CPORT_ID_BAD ? 0 : 1;
u8 *buffer; u8 *buffer;
if (gbuf->transfer_buffer)
return -EALREADY;
if (size > ES1_GBUF_MSG_SIZE) { if (size > ES1_GBUF_MSG_SIZE) {
pr_err("guf was asked to be bigger than %ld!\n", pr_err("guf was asked to be bigger than %ld!\n",
ES1_GBUF_MSG_SIZE); ES1_GBUF_MSG_SIZE);
...@@ -146,6 +149,7 @@ static void free_gbuf_data(struct gbuf *gbuf) ...@@ -146,6 +149,7 @@ static void free_gbuf_data(struct gbuf *gbuf)
if (gbuf->dest_cport_id != CPORT_ID_BAD) if (gbuf->dest_cport_id != CPORT_ID_BAD)
transfer_buffer--; /* Back up to cport id */ transfer_buffer--; /* Back up to cport id */
kfree(transfer_buffer); kfree(transfer_buffer);
gbuf->transfer_buffer = NULL;
} }
#define ES1_TIMEOUT 500 /* 500 ms for the SVC to do something */ #define ES1_TIMEOUT 500 /* 500 ms for the SVC to do something */
...@@ -214,6 +218,8 @@ static int submit_gbuf(struct gbuf *gbuf, gfp_t gfp_mask) ...@@ -214,6 +218,8 @@ static int submit_gbuf(struct gbuf *gbuf, gfp_t gfp_mask)
struct urb *urb; struct urb *urb;
transfer_buffer = gbuf->transfer_buffer; transfer_buffer = gbuf->transfer_buffer;
if (!transfer_buffer)
return -EINVAL;
buffer = &transfer_buffer[-1]; /* yes, we mean -1 */ buffer = &transfer_buffer[-1]; /* yes, we mean -1 */
/* Find a free urb */ /* Find a free urb */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment