diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-02-28 21:48:16 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-02-28 21:48:16 +0100 |
| commit | d4ab5487cc77a4053dc9070c5761ad94bf397825 (patch) | |
| tree | cd69e85b7cc3f45f10c3cf402c8a497be8da3944 /drivers/net/ethernet/intel/ice/ice_main.c | |
| parent | tty: Reserve ldisc 29 for development purposes (diff) | |
| parent | Linux 5.17-rc6 (diff) | |
| download | linux-dev-d4ab5487cc77a4053dc9070c5761ad94bf397825.tar.xz linux-dev-d4ab5487cc77a4053dc9070c5761ad94bf397825.zip | |
Merge 5.17-rc6 into tty-next
We need the tty/serial fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/ethernet/intel/ice/ice_main.c')
| -rw-r--r-- | drivers/net/ethernet/intel/ice/ice_main.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c index 17a9bb461dc3..f3c346e13b7a 100644 --- a/drivers/net/ethernet/intel/ice/ice_main.c +++ b/drivers/net/ethernet/intel/ice/ice_main.c @@ -1799,7 +1799,9 @@ static void ice_handle_mdd_event(struct ice_pf *pf) * reset, so print the event prior to reset. */ ice_print_vf_rx_mdd_event(vf); + mutex_lock(&pf->vf[i].cfg_lock); ice_reset_vf(&pf->vf[i], false); + mutex_unlock(&pf->vf[i].cfg_lock); } } } |