* [PATCH] pinctrl: mediatek: fix some NULL checks in probe
@ 2018-09-26 10:42 Dan Carpenter
2018-09-26 22:25 ` Sean Wang
0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2018-09-26 10:42 UTC (permalink / raw)
To: Linus Walleij, Zhiyong Tao
Cc: Matthias Brugger, linux-gpio-u79uwXL29TY76Z2rM5mHXA,
kernel-janitors-u79uwXL29TY76Z2rM5mHXA, Sean Wang,
linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r
The devm_kmalloc_array() function returns NULL on error, it doesn't
return error pointers.
Fixes: 805250982bb5 ("pinctrl: mediatek: add pinctrl-paris that implements the vendor dt-bindings")
Signed-off-by: Dan Carpenter <dan.carpenter-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>
diff --git a/drivers/pinctrl/mediatek/pinctrl-paris.c b/drivers/pinctrl/mediatek/pinctrl-paris.c
index 4cf0fea30b7d..d2179028f134 100644
--- a/drivers/pinctrl/mediatek/pinctrl-paris.c
+++ b/drivers/pinctrl/mediatek/pinctrl-paris.c
@@ -836,8 +836,8 @@ int mtk_paris_pinctrl_probe(struct platform_device *pdev,
hw->base = devm_kmalloc_array(&pdev->dev, hw->soc->nbase_names,
sizeof(*hw->base), GFP_KERNEL);
- if (IS_ERR(hw->base))
- return PTR_ERR(hw->base);
+ if (!hw->base)
+ return -ENOMEM;
for (i = 0; i < hw->soc->nbase_names; i++) {
res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
@@ -863,8 +863,8 @@ int mtk_paris_pinctrl_probe(struct platform_device *pdev,
/* Copy from internal struct mtk_pin_desc to register to the core */
pins = devm_kmalloc_array(&pdev->dev, hw->soc->npins, sizeof(*pins),
GFP_KERNEL);
- if (IS_ERR(pins))
- return PTR_ERR(pins);
+ if (!pins)
+ return -ENOMEM;
for (i = 0; i < hw->soc->npins; i++) {
pins[i].number = hw->soc->pins[i].number;
diff --git a/drivers/pinctrl/mediatek/pinctrl-moore.c b/drivers/pinctrl/mediatek/pinctrl-moore.c
index c27597cd3931..3bf5dd552749 100644
--- a/drivers/pinctrl/mediatek/pinctrl-moore.c
+++ b/drivers/pinctrl/mediatek/pinctrl-moore.c
@@ -608,8 +608,8 @@ int mtk_moore_pinctrl_probe(struct platform_device *pdev,
hw->base = devm_kmalloc_array(&pdev->dev, hw->soc->nbase_names,
sizeof(*hw->base), GFP_KERNEL);
- if (IS_ERR(hw->base))
- return PTR_ERR(hw->base);
+ if (!hw->base)
+ return -ENOMEM;
for (i = 0; i < hw->soc->nbase_names; i++) {
res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
@@ -629,8 +629,8 @@ int mtk_moore_pinctrl_probe(struct platform_device *pdev,
/* Copy from internal struct mtk_pin_desc to register to the core */
pins = devm_kmalloc_array(&pdev->dev, hw->soc->npins, sizeof(*pins),
GFP_KERNEL);
- if (IS_ERR(pins))
- return PTR_ERR(pins);
+ if (!pins)
+ return -ENOMEM;
for (i = 0; i < hw->soc->npins; i++) {
pins[i].number = hw->soc->pins[i].number;
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] pinctrl: mediatek: fix some NULL checks in probe
2018-09-26 10:42 [PATCH] pinctrl: mediatek: fix some NULL checks in probe Dan Carpenter
@ 2018-09-26 22:25 ` Sean Wang
0 siblings, 0 replies; 2+ messages in thread
From: Sean Wang @ 2018-09-26 22:25 UTC (permalink / raw)
To: Dan Carpenter
Cc: Zhiyong Tao, Linus Walleij,
kernel-janitors-u79uwXL29TY76Z2rM5mHXA,
linux-gpio-u79uwXL29TY76Z2rM5mHXA,
linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, Matthias Brugger
Hi,
The same patch is already being sent and applied in [1].
Sean
[1]
http://lists.infradead.org/pipermail/linux-mediatek/2018-September/015280.html
http://lists.infradead.org/pipermail/linux-mediatek/2018-September/015283.html
On Wed, 2018-09-26 at 13:42 +0300, Dan Carpenter wrote:
> The devm_kmalloc_array() function returns NULL on error, it doesn't
> return error pointers.
>
> Fixes: 805250982bb5 ("pinctrl: mediatek: add pinctrl-paris that implements the vendor dt-bindings")
> Signed-off-by: Dan Carpenter <dan.carpenter-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>
>
> diff --git a/drivers/pinctrl/mediatek/pinctrl-paris.c b/drivers/pinctrl/mediatek/pinctrl-paris.c
> index 4cf0fea30b7d..d2179028f134 100644
> --- a/drivers/pinctrl/mediatek/pinctrl-paris.c
> +++ b/drivers/pinctrl/mediatek/pinctrl-paris.c
> @@ -836,8 +836,8 @@ int mtk_paris_pinctrl_probe(struct platform_device *pdev,
>
> hw->base = devm_kmalloc_array(&pdev->dev, hw->soc->nbase_names,
> sizeof(*hw->base), GFP_KERNEL);
> - if (IS_ERR(hw->base))
> - return PTR_ERR(hw->base);
> + if (!hw->base)
> + return -ENOMEM;
>
> for (i = 0; i < hw->soc->nbase_names; i++) {
> res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
> @@ -863,8 +863,8 @@ int mtk_paris_pinctrl_probe(struct platform_device *pdev,
> /* Copy from internal struct mtk_pin_desc to register to the core */
> pins = devm_kmalloc_array(&pdev->dev, hw->soc->npins, sizeof(*pins),
> GFP_KERNEL);
> - if (IS_ERR(pins))
> - return PTR_ERR(pins);
> + if (!pins)
> + return -ENOMEM;
>
> for (i = 0; i < hw->soc->npins; i++) {
> pins[i].number = hw->soc->pins[i].number;
> diff --git a/drivers/pinctrl/mediatek/pinctrl-moore.c b/drivers/pinctrl/mediatek/pinctrl-moore.c
> index c27597cd3931..3bf5dd552749 100644
> --- a/drivers/pinctrl/mediatek/pinctrl-moore.c
> +++ b/drivers/pinctrl/mediatek/pinctrl-moore.c
> @@ -608,8 +608,8 @@ int mtk_moore_pinctrl_probe(struct platform_device *pdev,
>
> hw->base = devm_kmalloc_array(&pdev->dev, hw->soc->nbase_names,
> sizeof(*hw->base), GFP_KERNEL);
> - if (IS_ERR(hw->base))
> - return PTR_ERR(hw->base);
> + if (!hw->base)
> + return -ENOMEM;
>
> for (i = 0; i < hw->soc->nbase_names; i++) {
> res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
> @@ -629,8 +629,8 @@ int mtk_moore_pinctrl_probe(struct platform_device *pdev,
> /* Copy from internal struct mtk_pin_desc to register to the core */
> pins = devm_kmalloc_array(&pdev->dev, hw->soc->npins, sizeof(*pins),
> GFP_KERNEL);
> - if (IS_ERR(pins))
> - return PTR_ERR(pins);
> + if (!pins)
> + return -ENOMEM;
>
> for (i = 0; i < hw->soc->npins; i++) {
> pins[i].number = hw->soc->pins[i].number;
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-09-26 22:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-09-26 10:42 [PATCH] pinctrl: mediatek: fix some NULL checks in probe Dan Carpenter
2018-09-26 22:25 ` Sean Wang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).