2013-04-09 16:00:06

by Axel Lin

Subject: [PATCH] pinctrl: vt8500: wmt: Fix checking return value of pinctrl_register()

pinctrl_register() returns NULL on error.

Signed-off-by: Axel Lin <[email protected]>
---
drivers/pinctrl/vt8500/pinctrl-wmt.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/pinctrl/vt8500/pinctrl-wmt.c b/drivers/pinctrl/vt8500/pinctrl-wmt.c
index 14400a7..ab63104e 100644
--- a/drivers/pinctrl/vt8500/pinctrl-wmt.c
+++ b/drivers/pinctrl/vt8500/pinctrl-wmt.c
@@ -588,7 +588,7 @@ int wmt_pinctrl_probe(struct platform_device *pdev,
data->dev = &pdev->dev;

data->pctl_dev = pinctrl_register(&wmt_desc, &pdev->dev, data);
- if (IS_ERR(data->pctl_dev)) {
+ if (!data->pctl_dev) {
dev_err(&pdev->dev, "Failed to register pinctrl\n");
return -EINVAL;
}
--
1.7.10.4

2013-04-09 19:30:34

by Tony Prisk

Subject: Re: [PATCH] pinctrl: vt8500: wmt: Fix checking return value of pinctrl_register()

On 10/04/13 03:59, Axel Lin wrote:
> pinctrl_register() returns NULL on error.
>
> Signed-off-by: Axel Lin <[email protected]>
> ---
> drivers/pinctrl/vt8500/pinctrl-wmt.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/pinctrl/vt8500/pinctrl-wmt.c b/drivers/pinctrl/vt8500/pinctrl-wmt.c
> index 14400a7..ab63104e 100644
> --- a/drivers/pinctrl/vt8500/pinctrl-wmt.c
> +++ b/drivers/pinctrl/vt8500/pinctrl-wmt.c
> @@ -588,7 +588,7 @@ int wmt_pinctrl_probe(struct platform_device *pdev,
> data->dev = &pdev->dev;
>
> data->pctl_dev = pinctrl_register(&wmt_desc, &pdev->dev, data);
> - if (IS_ERR(data->pctl_dev)) {
> + if (!data->pctl_dev) {
> dev_err(&pdev->dev, "Failed to register pinctrl\n");
> return -EINVAL;
> }
Not sure why I missed this...

Linus,
If you're happy with this patch, I'll forward it on to arm-soc to go in
with the rest.

Regards
Tony P

2013-04-15 20:29:34

by Olof Johansson

Subject: Re: [PATCH] pinctrl: vt8500: wmt: Fix checking return value of pinctrl_register()

On Wed, Apr 10, 2013 at 07:30:36AM +1200, Tony Prisk wrote:
> On 10/04/13 03:59, Axel Lin wrote:
> >pinctrl_register() returns NULL on error.
> >
> >Signed-off-by: Axel Lin <[email protected]>
> >---
> > drivers/pinctrl/vt8500/pinctrl-wmt.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> >diff --git a/drivers/pinctrl/vt8500/pinctrl-wmt.c b/drivers/pinctrl/vt8500/pinctrl-wmt.c
> >index 14400a7..ab63104e 100644
> >--- a/drivers/pinctrl/vt8500/pinctrl-wmt.c
> >+++ b/drivers/pinctrl/vt8500/pinctrl-wmt.c
> >@@ -588,7 +588,7 @@ int wmt_pinctrl_probe(struct platform_device *pdev,
> > data->dev = &pdev->dev;
> > data->pctl_dev = pinctrl_register(&wmt_desc, &pdev->dev, data);
> >- if (IS_ERR(data->pctl_dev)) {
> >+ if (!data->pctl_dev) {
> > dev_err(&pdev->dev, "Failed to register pinctrl\n");
> > return -EINVAL;
> > }
> Not sure why I missed this...
>
> Linus,
> If you're happy with this patch, I'll forward it on to arm-soc to go
> in with the rest.

I was asked to apply this directly, and have done so (to next/drivers).


-Olof

2013-04-15 20:32:21

by Linus Walleij

Subject: Re: [PATCH] pinctrl: vt8500: wmt: Fix checking return value of pinctrl_register()

On Mon, Apr 15, 2013 at 10:29 PM, Olof Johansson <[email protected]> wrote:
> On Wed, Apr 10, 2013 at 07:30:36AM +1200, Tony Prisk wrote:
>> Linus,
>> If you're happy with this patch, I'll forward it on to arm-soc to go
>> in with the rest.
>
> I was asked to apply this directly, and have done so (to next/drivers).

That's cool,
Acked-by.

Yours,
Linus Walleij