diff options
| author | Linus Torvalds | 2018-04-27 09:37:12 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2018-04-27 09:37:12 -0700 |
| commit | 79a17dd9d2491443a0d03745adbb3d76ab97a356 (patch) | |
| tree | d1e8882799f1ba20470f169ac0b6d96f7dfc98ba /drivers | |
| parent | 1993cbf06aa95c0fcf080f2e858c116306b6c29e (diff) | |
| parent | b00e2fd10429eddf4a181ad30af010e56c2303f9 (diff) | |
Merge tag 'staging-4.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging fixes from Greg KH:
"Here are two staging driver fixups for 4.17-rc3.
The first is the remaining stragglers of the irda code removal that
you pointed out during the merge window. The second is a fix for the
wilc1000 driver due to a patch that got merged in 4.17-rc1.
Both of these have been in linux-next for a while with no reported
issues"
* tag 'staging-4.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
staging: wilc1000: fix NULL pointer exception in host_int_parse_assoc_resp_info()
staging: irda: remove remaining remants of irda code removal
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/wilc1000/host_interface.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c index 6b5300ca44a6..885f5fcead77 100644 --- a/drivers/staging/wilc1000/host_interface.c +++ b/drivers/staging/wilc1000/host_interface.c @@ -1390,7 +1390,7 @@ static inline void host_int_parse_assoc_resp_info(struct wilc_vif *vif, } if (hif_drv->usr_conn_req.ies) { - conn_info.req_ies = kmemdup(conn_info.req_ies, + conn_info.req_ies = kmemdup(hif_drv->usr_conn_req.ies, hif_drv->usr_conn_req.ies_len, GFP_KERNEL); if (conn_info.req_ies) |