1 files changed, 12 insertions, 9 deletions

diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c
index 18ee2089df4a..8b8f3a04c353 100644
--- a/drivers/pinctrl/core.c
+++ b/drivers/pinctrl/core.c
@@ -558,7 +558,7 @@ int pinctrl_get_group_selector(struct pinctrl_dev *pctldev,
 }
 
 /**
- * pinctrl_request_gpio() - request a single pin to be used in as GPIO
+ * pinctrl_request_gpio() - request a single pin to be used as GPIO
  * @gpio: the GPIO pin number from the GPIO subsystem number space
  *
  * This function should *ONLY* be used from gpiolib-based GPIO drivers,
@@ -1115,7 +1115,7 @@ int pinctrl_register_map(struct pinctrl_map const *maps, unsigned num_maps,
         int i, ret;
         struct pinctrl_maps *maps_node;
 
-        pr_debug("add %d pinmux maps\n", num_maps);
+        pr_debug("add %u pinctrl maps\n", num_maps);
 
         /* First sanity check the new mapping */
         for (i = 0; i < num_maps; i++) {
@@ -1704,14 +1704,14 @@ struct pinctrl_dev *pinctrl_register(struct pinctrl_desc *pctldesc,
         int ret;
 
         if (!pctldesc)
-                return NULL;
+                return ERR_PTR(-EINVAL);
         if (!pctldesc->name)
-                return NULL;
+                return ERR_PTR(-EINVAL);
 
         pctldev = kzalloc(sizeof(*pctldev), GFP_KERNEL);
         if (pctldev == NULL) {
                 dev_err(dev, "failed to alloc struct pinctrl_dev\n");
-                return NULL;
+                return ERR_PTR(-ENOMEM);
         }
 
         /* Initialize pin control device struct */
@@ -1724,20 +1724,23 @@ struct pinctrl_dev *pinctrl_register(struct pinctrl_desc *pctldesc,
         mutex_init(&pctldev->mutex);
 
         /* check core ops for sanity */
-        if (pinctrl_check_ops(pctldev)) {
+        ret = pinctrl_check_ops(pctldev);
+        if (ret) {
                 dev_err(dev, "pinctrl ops lacks necessary functions\n");
                 goto out_err;
         }
 
         /* If we're implementing pinmuxing, check the ops for sanity */
         if (pctldesc->pmxops) {
-                if (pinmux_check_ops(pctldev))
+                ret = pinmux_check_ops(pctldev);
+                if (ret)
                         goto out_err;
         }
 
         /* If we're implementing pinconfig, check the ops for sanity */
         if (pctldesc->confops) {
-                if (pinconf_check_ops(pctldev))
+                ret = pinconf_check_ops(pctldev);
+                if (ret)
                         goto out_err;
         }
 
@@ -1783,7 +1786,7 @@ struct pinctrl_dev *pinctrl_register(struct pinctrl_desc *pctldesc,
 out_err:
         mutex_destroy(&pctldev->mutex);
         kfree(pctldev);
-        return NULL;
+        return ERR_PTR(ret);
 }
 EXPORT_SYMBOL_GPL(pinctrl_register);