summaryrefslogtreecommitdiff
path: root/drivers/xen/xen-scsiback.c
diff options
context:
space:
mode:
authorMichael Bestas <mkbestas@lineageos.org>2021-03-21 14:43:20 +0200
committerMichael Bestas <mkbestas@lineageos.org>2021-03-21 14:43:20 +0200
commit53103bcd228bc3652d294c4ea2457c105f3a6655 (patch)
tree30b74996723a35710b3eece094bf0fa6a411d360 /drivers/xen/xen-scsiback.c
parent2bc69ae323d34342c2bda24adeb78c9ff321a9a3 (diff)
parentdb1bf2b55b337174e62637e6c23b45f166bdc14e (diff)
Merge remote-tracking branch 'msm8998/lineage-18.1' into lineage-18.1
Change-Id: Idfef6799ea14906bf74cad7ea86df630ff07416b
Diffstat (limited to 'drivers/xen/xen-scsiback.c')
-rw-r--r--drivers/xen/xen-scsiback.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/xen/xen-scsiback.c b/drivers/xen/xen-scsiback.c
index 29a1b8054a4d..7fb5a2e7fa81 100644
--- a/drivers/xen/xen-scsiback.c
+++ b/drivers/xen/xen-scsiback.c
@@ -415,12 +415,12 @@ static int scsiback_gnttab_data_map_batch(struct gnttab_map_grant_ref *map,
return 0;
err = gnttab_map_refs(map, NULL, pg, cnt);
- BUG_ON(err);
for (i = 0; i < cnt; i++) {
if (unlikely(map[i].status != GNTST_okay)) {
pr_err("invalid buffer -- could not remap it\n");
map[i].handle = SCSIBACK_INVALID_HANDLE;
- err = -ENOMEM;
+ if (!err)
+ err = -ENOMEM;
} else {
get_page(pg[i]);
}