summaryrefslogtreecommitdiffstats
path: root/drivers/xen/gntdev.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2021-10-18 13:51:43 +0100
committerMark Brown <broonie@kernel.org>2021-10-18 13:51:43 +0100
commited96f35cecb0a7d1d95bbba8b9f212e60d0f7480 (patch)
tree15fe5f3dc395c3b1e713ad52bcd529b1a343cfe2 /drivers/xen/gntdev.c
parent72bf80cf09c4693780ad93a31b48fa5a4e17a946 (diff)
parent519d81956ee277b4419c723adfb154603c2565ba (diff)
downloadlinux-stable-ed96f35cecb0a7d1d95bbba8b9f212e60d0f7480.tar.gz
linux-stable-ed96f35cecb0a7d1d95bbba8b9f212e60d0f7480.tar.bz2
linux-stable-ed96f35cecb0a7d1d95bbba8b9f212e60d0f7480.zip
Merge tag 'v5.15-rc6' into regulator-5.16
Linux 5.15-rc6
Diffstat (limited to 'drivers/xen/gntdev.c')
-rw-r--r--drivers/xen/gntdev.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/xen/gntdev.c b/drivers/xen/gntdev.c
index 1e7f6b1c0c97..fec1b6537166 100644
--- a/drivers/xen/gntdev.c
+++ b/drivers/xen/gntdev.c
@@ -381,6 +381,14 @@ static int __unmap_grant_pages(struct gntdev_grant_map *map, int offset,
map->unmap_ops[offset+i].handle,
map->unmap_ops[offset+i].status);
map->unmap_ops[offset+i].handle = INVALID_GRANT_HANDLE;
+ if (use_ptemod) {
+ if (map->kunmap_ops[offset+i].status)
+ err = -EINVAL;
+ pr_debug("kunmap handle=%u st=%d\n",
+ map->kunmap_ops[offset+i].handle,
+ map->kunmap_ops[offset+i].status);
+ map->kunmap_ops[offset+i].handle = INVALID_GRANT_HANDLE;
+ }
}
return err;
}