Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Kernel bump from 4.1.3-rt to 4.1.7-rt.
[kvmfornfv.git]
/
kernel
/
drivers
/
net
/
wireless
/
rsi
/
rsi_91x_usb_ops.c
diff --git
a/kernel/drivers/net/wireless/rsi/rsi_91x_usb_ops.c
b/kernel/drivers/net/wireless/rsi/rsi_91x_usb_ops.c
index
1106ce7
..
30c2cf7
100644
(file)
--- a/
kernel/drivers/net/wireless/rsi/rsi_91x_usb_ops.c
+++ b/
kernel/drivers/net/wireless/rsi/rsi_91x_usb_ops.c
@@
-146,7
+146,10
@@
static int rsi_load_ta_instructions(struct rsi_common *common)
return status;
}
return status;
}
+ /* Copy firmware into DMA-accessible memory */
fw = kmemdup(fw_entry->data, fw_entry->size, GFP_KERNEL);
fw = kmemdup(fw_entry->data, fw_entry->size, GFP_KERNEL);
+ if (!fw)
+ return -ENOMEM;
len = fw_entry->size;
if (len % 4)
len = fw_entry->size;
if (len % 4)
@@
-158,6
+161,7
@@
static int rsi_load_ta_instructions(struct rsi_common *common)
rsi_dbg(INIT_ZONE, "%s: num blocks: %d\n", __func__, num_blocks);
status = rsi_copy_to_card(common, fw, len, num_blocks);
rsi_dbg(INIT_ZONE, "%s: num blocks: %d\n", __func__, num_blocks);
status = rsi_copy_to_card(common, fw, len, num_blocks);
+ kfree(fw);
release_firmware(fw_entry);
return status;
}
release_firmware(fw_entry);
return status;
}