diff options
| author |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2022-03-14 19:14:29 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2022-03-14 19:14:29 -0700 |
| commit | ce8356335027d3929fbfae4127451adaf36e1cd4 (patch) | |
| tree | 8ac7d71d3b67a6138e811cd4d4e135d934233e47 /drivers/scsi/xen-scsifront.c | |
| parent | Input: mt6779-keypad - fix signedness bug (diff) | |
| parent | Linux 5.17-rc8 (diff) | |
| download | linux-dev-ce8356335027d3929fbfae4127451adaf36e1cd4.tar.xz linux-dev-ce8356335027d3929fbfae4127451adaf36e1cd4.zip | |
Merge tag 'v5.17-rc8' into next
Sync up with mainline to again get the latest changes in HID subsystem.
Diffstat (limited to 'drivers/scsi/xen-scsifront.c')
| -rw-r--r-- | drivers/scsi/xen-scsifront.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/scsi/xen-scsifront.c b/drivers/scsi/xen-scsifront.c index 12c10a5e3d93..7f421600cb66 100644 --- a/drivers/scsi/xen-scsifront.c +++ b/drivers/scsi/xen-scsifront.c @@ -233,12 +233,11 @@ static void scsifront_gnttab_done(struct vscsifrnt_info *info, return; for (i = 0; i < shadow->nr_grants; i++) { - if (unlikely(gnttab_query_foreign_access(shadow->gref[i]))) { + if (unlikely(!gnttab_try_end_foreign_access(shadow->gref[i]))) { shost_printk(KERN_ALERT, info->host, KBUILD_MODNAME "grant still in use by backend\n"); BUG(); } - gnttab_end_foreign_access(shadow->gref[i], 0, 0UL); } kfree(shadow->sg); |