Signed-off-by: Otavio Salvador <[email protected]>
Cc: Evgeniy Polyakov <[email protected]>
---
drivers/w1/w1_int.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/w1/w1_int.c b/drivers/w1/w1_int.c
index 6828835..afa5f5d 100644
--- a/drivers/w1/w1_int.c
+++ b/drivers/w1/w1_int.c
@@ -117,7 +117,7 @@ int w1_add_master_device(struct w1_bus_master *master)
return(-EINVAL);
}
/* While it would be electrically possible to make a device that
- * generated a strong pullup in bit bang mode, only hardare that
+ * generated a strong pullup in bit bang mode, only hardware that
* controls 1-wire time frames are even expected to support a strong
* pullup. w1_io.c would need to support calling set_pullup before
* the last write_bit operation of a w1_write_8 which it currently
--
1.7.10
,--[ build failure ]
| ...
| .../pinctrl-mxs.c: In function 'mxs_dt_node_to_map':
| .../pinctrl-mxs.c:140:3: error: implicit declaration of function 'free'
| [-Werror=implicit-function-declaration]
| .../pinctrl-mxs.c:140:3: warning: incompatible implicit declaration of
| built-in function 'free' [enabled by default]
| ...
`--
Signed-off-by: Otavio Salvador <[email protected]>
Cc: Linus Walleij <[email protected]>
---
drivers/pinctrl/pinctrl-mxs.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/pinctrl/pinctrl-mxs.c b/drivers/pinctrl/pinctrl-mxs.c
index afb50ee..85f8dda 100644
--- a/drivers/pinctrl/pinctrl-mxs.c
+++ b/drivers/pinctrl/pinctrl-mxs.c
@@ -136,8 +136,7 @@ static int mxs_dt_node_to_map(struct pinctrl_dev *pctldev,
return 0;
free_group:
- if (!purecfg)
- free(group);
+ kfree(group);
free:
kfree(new_map);
return ret;
--
1.7.10