Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

[linux.git] / drivers / nvmem / mxs-ocotp.c

diff --git a/drivers/nvmem/mxs-ocotp.c b/drivers/nvmem/mxs-ocotp.c
index 7018e2ef57147179b75deca13a3e0663158fcec1..53122f59c4b217f43b8ff2643ac2a12f903347d0 100644 (file)
--- a/drivers/nvmem/mxs-ocotp.c
+++ b/drivers/nvmem/mxs-ocotp.c
@@ -177,7 +177,7 @@ static int mxs_ocotp_probe(struct platform_device *pdev)
        ocotp_config.size = data->size;
        ocotp_config.priv = otp;
        ocotp_config.dev = dev;
-       otp->nvmem = nvmem_register(&ocotp_config);
+       otp->nvmem = devm_nvmem_register(dev, &ocotp_config);
        if (IS_ERR(otp->nvmem)) {
                ret = PTR_ERR(otp->nvmem);
                goto err_clk;
@@ -199,7 +199,7 @@ static int mxs_ocotp_remove(struct platform_device *pdev)
 
        clk_unprepare(otp->clk);
 
-       return nvmem_unregister(otp->nvmem);
+       return 0;
 }
 
 static struct platform_driver mxs_ocotp_driver = {