diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-07-18 23:41:42 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-07-18 23:41:42 +0300 |
commit | dc14036fb3240a1bc2677cf8de33fbcb3af77826 (patch) | |
tree | 177cd42a0fdc3e37504075d3b389bf7e894ffb5e /drivers/s390/crypto/ap_bus.c | |
parent | c76d09da77d69d7f737540985912ad2bca654713 (diff) | |
parent | ff6992735ade75aae3e35d16b17da1008d753d28 (diff) | |
download | linux-dc14036fb3240a1bc2677cf8de33fbcb3af77826.tar.xz |
Merge 5.19-rc7 into usb-next
We need the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/s390/crypto/ap_bus.c')
-rw-r--r-- | drivers/s390/crypto/ap_bus.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/crypto/ap_bus.c b/drivers/s390/crypto/ap_bus.c index 5c13d2079d96..0a9045b49c50 100644 --- a/drivers/s390/crypto/ap_bus.c +++ b/drivers/s390/crypto/ap_bus.c @@ -1435,7 +1435,7 @@ static int __verify_queue_reservations(struct device_driver *drv, void *data) if (ap_drv->in_use) { rc = ap_drv->in_use(ap_perms.apm, newaqm); if (rc) - return -EBUSY; + rc = -EBUSY; } /* release the driver's module */ |