These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / gpio / gpio-74xx-mmio.c

diff --git a/kernel/drivers/gpio/gpio-74xx-mmio.c b/kernel/drivers/gpio/gpio-74xx-mmio.c
index 0763655..6b18682 100644 (file)
--- a/kernel/drivers/gpio/gpio-74xx-mmio.c
+++ b/kernel/drivers/gpio/gpio-74xx-mmio.c
@@ -113,13 +113,16 @@ static int mmio_74xx_dir_out(struct gpio_chip *gc, unsigned int gpio, int val)
 
 static int mmio_74xx_gpio_probe(struct platform_device *pdev)
 {
-       const struct of_device_id *of_id =
-               of_match_device(mmio_74xx_gpio_ids, &pdev->dev);
+       const struct of_device_id *of_id;
        struct mmio_74xx_gpio_priv *priv;
        struct resource *res;
        void __iomem *dat;
        int err;
 
+       of_id = of_match_device(mmio_74xx_gpio_ids, &pdev->dev);
+       if (!of_id)
+               return -ENODEV;
+
        priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
        if (!priv)
                return -ENOMEM;
@@ -129,7 +132,7 @@ static int mmio_74xx_gpio_probe(struct platform_device *pdev)
        if (IS_ERR(dat))
                return PTR_ERR(dat);
 
-       priv->flags = (unsigned)of_id->data;
+       priv->flags = (uintptr_t) of_id->data;
 
        err = bgpio_init(&priv->bgc, &pdev->dev,
                         DIV_ROUND_UP(MMIO_74XX_BIT_CNT(priv->flags), 8),