From 65691865ff11ec878a03e9a9d4003dd72d00bf47 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Sat, 22 Sep 2012 14:40:14 +0800 Subject: [PATCH] --- yaml --- r: 333084 b: refs/heads/master c: e76a322af16ba7be9b303239352e140209bf3822 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/leds/leds-lm3642.c | 15 +++------------ 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index 20fdef183ab4..b9ddd210c479 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8b7cfbec052d3a0b8e8c7de24a6b5f00d340e193 +refs/heads/master: e76a322af16ba7be9b303239352e140209bf3822 diff --git a/trunk/drivers/leds/leds-lm3642.c b/trunk/drivers/leds/leds-lm3642.c index 924853b7922c..3285006e9888 100644 --- a/trunk/drivers/leds/leds-lm3642.c +++ b/trunk/drivers/leds/leds-lm3642.c @@ -95,23 +95,14 @@ struct lm3642_chip_data { /* chip initialize */ static int __devinit lm3642_chip_init(struct lm3642_chip_data *chip) { - unsigned int reg_val; int ret; struct lm3642_platform_data *pdata = chip->pdata; /* set enable register */ - ret = regmap_read(chip->regmap, REG_ENABLE, ®_val); + ret = regmap_update_bits(chip->regmap, REG_ENABLE, EX_PIN_ENABLE_MASK, + pdata->tx_pin); if (ret < 0) - goto out; - - reg_val &= (~EX_PIN_ENABLE_MASK); - reg_val |= pdata->tx_pin; - ret = regmap_write(chip->regmap, REG_ENABLE, reg_val); - if (ret < 0) - goto out; - -out: - dev_err(chip->dev, "Failed to read REG_ENABLE Register\n"); + dev_err(chip->dev, "Failed to update REG_ENABLE Register\n"); return ret; }