diff options
author | Daiane Angolini <daiane.angolini@foundries.io> | 2022-11-08 16:35:18 -0300 |
---|---|---|
committer | Daiane Angolini <daiane.angolini@foundries.io> | 2022-11-08 16:35:18 -0300 |
commit | 28f04363b04142c45f8a29d0c32e21b060975e90 (patch) | |
tree | 8578cfe035db9bd4b78a0c504512c5e7f89a96cb /drivers/nvmem | |
parent | 7540d075c97713a4366a00b5c928261436b93d2d (diff) | |
parent | bd8a595958a5b02e58cdd6fed82d4ebc77b1988a (diff) |
Merge tag 'v5.15.75' into 5.15-2.1.x-imx
This is the 5.15.75 stable release
Conflicts:
arch/arm/boot/dts/imx6dl.dtsi
arch/arm/boot/dts/imx6q.dtsi
arch/arm/boot/dts/imx6sl.dtsi
arch/arm/boot/dts/imx6sll.dtsi
arch/arm/boot/dts/imx6sx.dtsi
arch/arm/boot/dts/imx7d-sdb.dts
drivers/char/hw_random/imx-rngc.c
drivers/dma/mxs-dma.c
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
drivers/tty/serial/fsl_lpuart.c
drivers/usb/host/xhci.h
Signed-off-by: Daiane Angolini <daiane.angolini@foundries.io>
Diffstat (limited to 'drivers/nvmem')
-rw-r--r-- | drivers/nvmem/core.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index fb7840c73765..38bab84f3c8a 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -824,21 +824,18 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config) nvmem->dev.groups = nvmem_dev_groups; #endif - if (nvmem->nkeepout) { - rval = nvmem_validate_keepouts(nvmem); - if (rval) { - ida_free(&nvmem_ida, nvmem->id); - kfree(nvmem); - return ERR_PTR(rval); - } - } - dev_dbg(&nvmem->dev, "Registering nvmem device %s\n", config->name); rval = device_register(&nvmem->dev); if (rval) goto err_put_device; + if (nvmem->nkeepout) { + rval = nvmem_validate_keepouts(nvmem); + if (rval) + goto err_device_del; + } + if (config->compat) { rval = nvmem_sysfs_setup_compat(nvmem, config); if (rval) |