diff options
author | Peter Zijlstra <peterz@infradead.org> | 2020-07-22 10:22:02 +0200 |
---|---|---|
committer | Peter Zijlstra <peterz@infradead.org> | 2020-07-22 10:22:02 +0200 |
commit | 015dc08918785201199ed3450c22bb8939f09dfe (patch) | |
tree | 7ba52e0b1e518fa750aaac0c1da8dd70c3eca1eb /drivers/xen/xenbus/xenbus_client.c | |
parent | sched: Add a tracepoint to track rq->nr_running (diff) | |
parent | sched: Fix race against ptrace_freeze_trace() (diff) | |
download | linux-015dc08918785201199ed3450c22bb8939f09dfe.tar.xz linux-015dc08918785201199ed3450c22bb8939f09dfe.zip |
Merge branch 'sched/urgent'
Diffstat (limited to 'drivers/xen/xenbus/xenbus_client.c')
-rw-r--r-- | drivers/xen/xenbus/xenbus_client.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/xen/xenbus/xenbus_client.c b/drivers/xen/xenbus/xenbus_client.c index 4f168b46fbca..786fbb7d8be0 100644 --- a/drivers/xen/xenbus/xenbus_client.c +++ b/drivers/xen/xenbus/xenbus_client.c @@ -693,10 +693,8 @@ static int xenbus_map_ring_pv(struct xenbus_device *dev, bool leaked; area = alloc_vm_area(XEN_PAGE_SIZE * nr_grefs, info->ptes); - if (!area) { - kfree(node); + if (!area) return -ENOMEM; - } for (i = 0; i < nr_grefs; i++) info->phys_addrs[i] = |