diff options
| author | Vasily Gorbik <gor@linux.ibm.com> | 2021-10-26 16:20:04 +0300 |
|---|---|---|
| committer | Vasily Gorbik <gor@linux.ibm.com> | 2021-10-26 16:20:04 +0300 |
| commit | e7456f7adbaac0ec15a61b4b3a172cc4241ebb34 (patch) | |
| tree | c25c2e74a0c4ca658cc7766501709762e040c057 /arch/s390/pci/pci_event.c | |
| parent | 1a446b24730e78777078c4e2d24ba71dbf06a213 (diff) | |
| parent | 8b7216439e2e2128f6f1a19ad4b6be94d8b0e23d (diff) | |
| download | linux-e7456f7adbaac0ec15a61b4b3a172cc4241ebb34.tar.xz | |
Merge branch 'fixes' into features
pci and string functions changes on features depend on changes from the
fixes branch.
* fixes:
s390: add Alexander Gordeev as reviewer
s390: fix strrchr() implementation
vfio-ccw: step down as maintainer
KVM: s390: remove myself as reviewer
s390/pci: fix zpci_zdev_put() on reserve
bpf, s390: Fix potential memory leak about jit_data
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
Diffstat (limited to 'arch/s390/pci/pci_event.c')
| -rw-r--r-- | arch/s390/pci/pci_event.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/pci/pci_event.c b/arch/s390/pci/pci_event.c index 461bfb12a3a3..6a5bfa9dc1f2 100644 --- a/arch/s390/pci/pci_event.c +++ b/arch/s390/pci/pci_event.c @@ -144,7 +144,7 @@ static void __zpci_event_availability(struct zpci_ccdf_avail *ccdf) /* The 0x0304 event may immediately reserve the device */ if (!clp_get_state(zdev->fid, &state) && state == ZPCI_FN_STATE_RESERVED) { - zpci_zdev_put(zdev); + zpci_device_reserved(zdev); } } break; @@ -155,7 +155,7 @@ static void __zpci_event_availability(struct zpci_ccdf_avail *ccdf) case 0x0308: /* Standby -> Reserved */ if (!zdev) break; - zpci_zdev_put(zdev); + zpci_device_reserved(zdev); break; default: break; |