2009-11-30 14:01:53

by Mark Brown

Subject: [PATCH 2.6.32] regulator: Initialise wm831x structure pointor for ISINK driver

The version that made it into mainline missed the initialisation of the
chip handle.

Signed-off-by: Mark Brown <[email protected]>
---
drivers/regulator/wm831x-isink.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/regulator/wm831x-isink.c b/drivers/regulator/wm831x-isink.c
index 1d8d987..4885700 100644
--- a/drivers/regulator/wm831x-isink.c
+++ b/drivers/regulator/wm831x-isink.c
@@ -167,6 +167,8 @@ static __devinit int wm831x_isink_probe(struct platform_device *pdev)
return -ENOMEM;
}

+ isink->wm831x = wm831x;
+
res = platform_get_resource(pdev, IORESOURCE_IO, 0);
if (res == NULL) {
dev_err(&pdev->dev, "No I/O resource\n");
--
1.6.5.3

2009-12-02 19:35:36

by Liam Girdwood

Subject: Re: [PATCH 2.6.32] regulator: Initialise wm831x structure pointor for ISINK driver

On Mon, 2009-11-30 at 14:01 +0000, Mark Brown wrote:
> The version that made it into mainline missed the initialisation of the
> chip handle.
>
> Signed-off-by: Mark Brown <[email protected]>
> ---
> drivers/regulator/wm831x-isink.c | 2 ++
> 1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/regulator/wm831x-isink.c b/drivers/regulator/wm831x-isink.c
> index 1d8d987..4885700 100644
> --- a/drivers/regulator/wm831x-isink.c
> +++ b/drivers/regulator/wm831x-isink.c
> @@ -167,6 +167,8 @@ static __devinit int wm831x_isink_probe(struct platform_device *pdev)
> return -ENOMEM;
> }
>
> + isink->wm831x = wm831x;
> +
> res = platform_get_resource(pdev, IORESOURCE_IO, 0);
> if (res == NULL) {
> dev_err(&pdev->dev, "No I/O resource\n");

Applied.

Thanks

Liam