diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-04-07 17:41:52 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-04-07 17:41:52 +1000 |
| commit | 0be34db467384a383d3a447ccd5c4aa880b1da11 (patch) | |
| tree | b86d7faf9e6991b27121b1724abc25d2c4362232 /drivers/nvdimm/dimm_devs.c | |
| parent | de1e69aae2ee1ddc7caaa42835c5265ffbfd4b27 (diff) | |
| parent | e7bdf14d8df77bb938e5ca9ade7de14c94af704b (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'drivers/nvdimm/dimm_devs.c')
| -rw-r--r-- | drivers/nvdimm/dimm_devs.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/nvdimm/dimm_devs.c b/drivers/nvdimm/dimm_devs.c index 0eedc49e0d47..3bd332b167d9 100644 --- a/drivers/nvdimm/dimm_devs.c +++ b/drivers/nvdimm/dimm_devs.c @@ -102,10 +102,7 @@ int nvdimm_init_config_data(struct nvdimm_drvdata *ndd) return -ENXIO; } - ndd->data = kmalloc(ndd->nsarea.config_size, GFP_KERNEL); - if (!ndd->data) - ndd->data = vmalloc(ndd->nsarea.config_size); - + ndd->data = kvmalloc(ndd->nsarea.config_size, GFP_KERNEL); if (!ndd->data) return -ENOMEM; |