Re: [PATCH 1/2] FIX: engine_state is uninitialized

From: Jonathan NeuschÃfer
Date: Mon Apr 18 2011 - 07:21:44 EST


On Sat, Apr 16, 2011 at 02:13:13PM +0530, Raghavendra D Prabhu wrote:
> In case lp5521_read() returns EIO, engine_state is in an uninitialized state. This
> adds checks to fix that.
>
> Signed-off-by: Raghavendra D Prabhu <rprabhu@xxxxxxxxxxx>
> ---
> drivers/leds/leds-lp5521.c | 10 ++++++----
> 1 files changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/leds/leds-lp5521.c b/drivers/leds/leds-lp5521.c
> index c0cff64..6c5eac0 100644
> --- a/drivers/leds/leds-lp5521.c
> +++ b/drivers/leds/leds-lp5521.c
> @@ -176,11 +176,13 @@ static int lp5521_set_engine_mode(struct lp5521_engine *engine, u8 mode)
> ret = lp5521_read(client, LP5521_REG_OP_MODE, &engine_state);
> + if (ret == 0){
> /* set mode only for this engine */
> - engine_state &= ~(engine->engine_mask);
> - mode &= engine->engine_mask;
> - engine_state |= mode;
> - ret |= lp5521_write(client, LP5521_REG_OP_MODE, engine_state);
> + engine_state &= ~(engine->engine_mask);
> + mode &= engine->engine_mask;
> + engine_state |= mode;
> + ret |= lp5521_write(client, LP5521_REG_OP_MODE, engine_state);
> + }
> return ret;
> }
> --
> 1.7.4.4

Usually something like

if (ret < 0)
goto out;

/* some code here */

out:
return ret;

is preferred to avoid unnecessary nesting/indentation. Anyway, thanks for the
patch (although I'm not the maintainer, but just commenting).

Thanks,
Jonathan NeuschÃfer
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/