]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
nvmem: imx-ocotp: Fix assignment warning.
authorSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Thu, 2 Jun 2016 11:19:44 +0000 (12:19 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 25 Jun 2016 14:42:55 +0000 (07:42 -0700)
This patch fixes below error if the driver is compiled with 64 bit
machine configuration.

"drivers/nvmem/imx-ocotp.c:102:14: warning: assignment makes integer
from pointer without a cast"

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Acked-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/nvmem/imx-ocotp.c

index a34039018f9b8b6b934452912212ae8adc094c79..ac27b9bac3b9a9abe219e7d60fab8ea946c0abd8 100644 (file)
@@ -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;