diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2022-10-03 15:33:43 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2022-10-03 15:33:43 -0400 |
| commit | e18d6152ff0f41b7f01f9817372022df04e0d354 (patch) | |
| tree | 9ddc6841785bb3349933c6d832e722ba91cea131 /drivers/net/ethernet/aquantia/atlantic/aq_main.c | |
| parent | fe4d9e4abf622598bd199d0805d20afa12f70c92 (diff) | |
| parent | b60ca69715fcc39a5f4bdd56ca2ea691b7358455 (diff) | |
| download | linux-stable-e18d6152ff0f41b7f01f9817372022df04e0d354.tar.gz linux-stable-e18d6152ff0f41b7f01f9817372022df04e0d354.tar.bz2 linux-stable-e18d6152ff0f41b7f01f9817372022df04e0d354.zip | |
Merge tag 'kvm-riscv-6.1-1' of https://github.com/kvm-riscv/linux into HEAD
KVM/riscv changes for 6.1
- Improved instruction encoding infrastructure for
instructions not yet supported by binutils
- Svinval support for both KVM Host and KVM Guest
- Zihintpause support for KVM Guest
- Zicbom support for KVM Guest
- Record number of signal exits as a VCPU stat
- Use generic guest entry infrastructure
Diffstat (limited to 'drivers/net/ethernet/aquantia/atlantic/aq_main.c')
| -rw-r--r-- | drivers/net/ethernet/aquantia/atlantic/aq_main.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_main.c b/drivers/net/ethernet/aquantia/atlantic/aq_main.c index 88595863d8bc..8a0af371e7dc 100644 --- a/drivers/net/ethernet/aquantia/atlantic/aq_main.c +++ b/drivers/net/ethernet/aquantia/atlantic/aq_main.c @@ -94,11 +94,8 @@ static int aq_ndev_close(struct net_device *ndev) int err = 0; err = aq_nic_stop(aq_nic); - if (err < 0) - goto err_exit; aq_nic_deinit(aq_nic, true); -err_exit: return err; } |