|
@@ -1807,16 +1807,18 @@ static int wsm_buf_reserve(struct wsm_buf *buf, size_t extra_size)
|
|
|
{
|
|
|
size_t pos = buf->data - buf->begin;
|
|
|
size_t size = pos + extra_size;
|
|
|
+ u8 *tmp;
|
|
|
|
|
|
size = round_up(size, FWLOAD_BLOCK_SIZE);
|
|
|
|
|
|
- buf->begin = krealloc(buf->begin, size, GFP_KERNEL | GFP_DMA);
|
|
|
- if (buf->begin) {
|
|
|
- buf->data = &buf->begin[pos];
|
|
|
- buf->end = &buf->begin[size];
|
|
|
- return 0;
|
|
|
- } else {
|
|
|
- buf->end = buf->data = buf->begin;
|
|
|
+ tmp = krealloc(buf->begin, size, GFP_KERNEL | GFP_DMA);
|
|
|
+ if (!tmp) {
|
|
|
+ wsm_buf_deinit(buf);
|
|
|
return -ENOMEM;
|
|
|
}
|
|
|
+
|
|
|
+ buf->begin = tmp;
|
|
|
+ buf->data = &buf->begin[pos];
|
|
|
+ buf->end = &buf->begin[size];
|
|
|
+ return 0;
|
|
|
}
|