From 28f972a4d58d5056841d87d2a6095fe3c7f82108 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Mon, 31 Oct 2011 17:12:12 -0700 Subject: [PATCH] --- yaml --- r: 272208 b: refs/heads/master c: fa0ea0e16f748e36d65931227188ccf07f2b77c7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/leds/leds-lp5521.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 3cd06af86780..1cc91eed2f3d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2b67c95b74f17c13c7b3a990540c9dd9b4a8480d +refs/heads/master: fa0ea0e16f748e36d65931227188ccf07f2b77c7 diff --git a/trunk/drivers/leds/leds-lp5521.c b/trunk/drivers/leds/leds-lp5521.c index 9fc122c81f06..16f281b8c2d0 100644 --- a/trunk/drivers/leds/leds-lp5521.c +++ b/trunk/drivers/leds/leds-lp5521.c @@ -175,14 +175,14 @@ static int lp5521_set_engine_mode(struct lp5521_engine *engine, u8 mode) mode = LP5521_CMD_DIRECT; ret = lp5521_read(client, LP5521_REG_OP_MODE, &engine_state); + if (ret < 0) + return ret; /* 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); - - return ret; + return lp5521_write(client, LP5521_REG_OP_MODE, engine_state); } static int lp5521_load_program(struct lp5521_engine *eng, const u8 *pattern)