diff options
author | Greg Kroah-Hartman | 2019-01-28 08:17:02 +0100 |
---|---|---|
committer | Greg Kroah-Hartman | 2019-01-28 08:17:02 +0100 |
commit | d61b5d546af21e886aafcc9182f5ac5935a3177d (patch) | |
tree | 448b389768a74efb604dd22ea2a5d43686ea3be5 /drivers/staging/wilc1000/host_interface.c | |
parent | staging: erofs: fix potential double iput in erofs_read_super() (diff) | |
parent | Linux 5.0-rc4 (diff) | |
download | kernel-qcow2-linux-d61b5d546af21e886aafcc9182f5ac5935a3177d.tar.gz kernel-qcow2-linux-d61b5d546af21e886aafcc9182f5ac5935a3177d.tar.xz kernel-qcow2-linux-d61b5d546af21e886aafcc9182f5ac5935a3177d.zip |
Merge 5.0-rc4 into staging-next
We need the staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/wilc1000/host_interface.c')
-rw-r--r-- | drivers/staging/wilc1000/host_interface.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c index 85573eb400af..fbb61de20304 100644 --- a/drivers/staging/wilc1000/host_interface.c +++ b/drivers/staging/wilc1000/host_interface.c @@ -33,7 +33,7 @@ struct wilc_op_mode { struct wilc_reg_frame { bool reg; u8 reg_id; - __le32 frame_type; + __le16 frame_type; } __packed; struct wilc_drv_handler { @@ -1386,7 +1386,6 @@ int wilc_add_rx_gtk(struct wilc_vif *vif, const u8 *rx_gtk, u8 gtk_key_len, result = wilc_send_config_pkt(vif, WILC_SET_CFG, wid_list, ARRAY_SIZE(wid_list), wilc_get_vif_idx(vif)); - kfree(gtk_key); } else if (mode == WILC_STATION_MODE) { struct wid wid; @@ -1396,9 +1395,9 @@ int wilc_add_rx_gtk(struct wilc_vif *vif, const u8 *rx_gtk, u8 gtk_key_len, wid.val = (u8 *)gtk_key; result = wilc_send_config_pkt(vif, WILC_SET_CFG, &wid, 1, wilc_get_vif_idx(vif)); - kfree(gtk_key); } + kfree(gtk_key); return result; } |