Re: [PATCH 1/3] regulator: tps65910: fix device initialisation

Johan Hovold
2011-08-30T16:05:10Z

On Sun, Aug 28, 2011 at 05:32:57PM +0100, Liam Girdwood wrote:
> Hi Johan,
>
> On Mon, 2011-08-15 at 12:45 +0200, Johan Hovold wrote:
> > Fix regression introduced by commit
> > a320e3c3d6351814afa5182159df88d2637e0f6f (regulator: tps65911: Add new
> > chip version) which broke probe for all devices:
> >
> > "Invalid tps chip version"
> >
> > Cc: stable@kernel.org
> > Signed-off-by: Johan Hovold <jhovold@gmail.com>
> > ---
> > drivers/regulator/tps65910-regulator.c | 2 ++
> > 1 files changed, 2 insertions(+), 0 deletions(-)
> >
> > diff --git a/drivers/regulator/tps65910-regulator.c b/drivers/regulator/tps65910-regulator.c
> > index 55dd4e6..bc5ed25 100644
> > --- a/drivers/regulator/tps65910-regulator.c
> > +++ b/drivers/regulator/tps65910-regulator.c
> > @@ -898,9 +898,11 @@ static __devinit int tps65910_probe(struct platform_device *pdev)
> > case TPS65910:
> > pmic->get_ctrl_reg = &tps65910_get_ctrl_register;
> > info = tps65910_regs;
> > + break;
> > case TPS65911:
> > pmic->get_ctrl_reg = &tps65911_get_ctrl_register;
> > info = tps65911_regs;
> > + break;
> > default:
> > pr_err("Invalid tps chip version\n");
> > return -ENODEV;
>
> Couldn't apply these as it seems there may already be fixes to some of
> the issues fixed by your patches. Could you update and resend.

It seems patches 1 and 2 are subsumed by Axel Lin's
d04156bca629740a661fd0738cd69ba1f08b2b20 (regulator: tps65910: Add
missing breaks in switch/case), but this one was not marked for stable
even though it fixes a regression for tps65910 devices.

I'll send an updated patch 3 in a minute.

Thanks,
Johan