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

[kvmfornfv.git] / kernel / drivers / pinctrl / spear / pinctrl-spear.c

diff --git a/kernel/drivers/pinctrl/spear/pinctrl-spear.c b/kernel/drivers/pinctrl/spear/pinctrl-spear.c
index abdb05a..0afaf79 100644 (file)
--- a/kernel/drivers/pinctrl/spear/pinctrl-spear.c
+++ b/kernel/drivers/pinctrl/spear/pinctrl-spear.c
@@ -2,7 +2,7 @@
  * Driver for the ST Microelectronics SPEAr pinmux
  *
  * Copyright (C) 2012 ST Microelectronics
- * Viresh Kumar <viresh.linux@gmail.com>
+ * Viresh Kumar <vireshk@kernel.org>
  *
  * Inspired from:
  * - U300 Pinctl drivers
@@ -396,9 +396,9 @@ int spear_pinctrl_probe(struct platform_device *pdev,
        spear_pinctrl_desc.npins = machdata->npins;
 
        pmx->pctl = pinctrl_register(&spear_pinctrl_desc, &pdev->dev, pmx);
-       if (!pmx->pctl) {
+       if (IS_ERR(pmx->pctl)) {
                dev_err(&pdev->dev, "Couldn't register pinctrl driver\n");
-               return -ENODEV;
+               return PTR_ERR(pmx->pctl);
        }
 
        return 0;