diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-05-17 09:47:44 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-05-17 09:47:44 +0200 |
| commit | d8218b0de51f36f01ed67731ccf174059a33bb1e (patch) | |
| tree | b38b8856852ab651c4297c33ba47a49ca4dde419 /drivers/xen/unpopulated-alloc.c | |
| parent | 76e78f3df8f5d21b1a85f770fa92a1fd211e429b (diff) | |
| parent | d07f6ca923ea0927a1024dfccafc5b53b61cfecc (diff) | |
Merge 5.13-rc2 into staging-next
We need the staging and iio fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/xen/unpopulated-alloc.c')
| -rw-r--r-- | drivers/xen/unpopulated-alloc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/xen/unpopulated-alloc.c b/drivers/xen/unpopulated-alloc.c index e64e6befc63b..87e6b7db892f 100644 --- a/drivers/xen/unpopulated-alloc.c +++ b/drivers/xen/unpopulated-alloc.c @@ -39,8 +39,10 @@ static int fill_list(unsigned int nr_pages) } pgmap = kzalloc(sizeof(*pgmap), GFP_KERNEL); - if (!pgmap) + if (!pgmap) { + ret = -ENOMEM; goto err_pgmap; + } pgmap->type = MEMORY_DEVICE_GENERIC; pgmap->range = (struct range) { |