Merge branch 'linus' into x86/microcode, to pick up merge window changes

[cascardo/linux.git] / drivers / nvmem / imx-ocotp.c

diff --git a/drivers/nvmem/imx-ocotp.c b/drivers/nvmem/imx-ocotp.c
index a340390..ac27b9b 100644 (file)
--- a/drivers/nvmem/imx-ocotp.c
+++ b/drivers/nvmem/imx-ocotp.c
@@ -99,7 +99,7 @@ static int imx_ocotp_probe(struct platform_device *pdev)
                return PTR_ERR(priv->clk);
 
        of_id = of_match_device(imx_ocotp_dt_ids, dev);
-       priv->nregs = (unsigned int)of_id->data;
+       priv->nregs = (unsigned long)of_id->data;
        imx_ocotp_nvmem_config.size = 4 * priv->nregs;
        imx_ocotp_nvmem_config.dev = dev;
        imx_ocotp_nvmem_config.priv = priv;