linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Danny Kukawka <danny.kukawka@bisect.de>
To: Richard Purdie <rpurdie@rpsys.net>
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH v2 16/16] leds-lp5523: fix compiler warning
Date: Mon, 30 Jan 2012 23:00:20 +0100	[thread overview]
Message-ID: <1327960820-11867-17-git-send-email-danny.kukawka@bisect.de> (raw)
In-Reply-To: <1327960820-11867-1-git-send-email-danny.kukawka@bisect.de>

Fix for some -Wuninitialized compiler warnings.

Signed-off-by: Danny Kukawka <danny.kukawka@bisect.de>
---
 drivers/leds/leds-lp5523.c |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/drivers/leds/leds-lp5523.c b/drivers/leds/leds-lp5523.c
index 73e791a..c11fce0 100644
--- a/drivers/leds/leds-lp5523.c
+++ b/drivers/leds/leds-lp5523.c
@@ -192,7 +192,7 @@ static int lp5523_detect(struct i2c_client *client)
 static int lp5523_configure(struct i2c_client *client)
 {
 	struct lp5523_chip *chip = i2c_get_clientdata(client);
-	int ret = 0;
+	int ret = 0, ret2 = 0;
 	u8 status;
 
 	/* one pattern per engine setting led mux start and stop addresses */
@@ -243,7 +243,10 @@ static int lp5523_configure(struct i2c_client *client)
 
 	/* Let the programs run for couple of ms and check the engine status */
 	usleep_range(3000, 6000);
-	lp5523_read(client, LP5523_REG_STATUS, &status);
+	ret2 = lp5523_read(client, LP5523_REG_STATUS, &status);
+	if (ret2) 
+		return -1;
+	
 	status &= LP5523_ENG_STATUS_MASK;
 
 	if (status == LP5523_ENG_STATUS_MASK) {
@@ -461,7 +464,10 @@ static ssize_t lp5523_selftest(struct device *dev,
 	if (!(status & LP5523_LEDTEST_DONE))
 		usleep_range(3000, 6000); /* Was not ready. Wait little bit */
 
-	ret |= lp5523_read(chip->client, LP5523_REG_LED_TEST_ADC, &vdd);
+	ret = lp5523_read(chip->client, LP5523_REG_LED_TEST_ADC, &vdd);
+	if (ret)
+		goto fail;
+
 	vdd--;	/* There may be some fluctuation in measurement */
 
 	for (i = 0; i < LP5523_LEDS; i++) {
@@ -485,7 +491,9 @@ static ssize_t lp5523_selftest(struct device *dev,
 		ret = lp5523_read(chip->client, LP5523_REG_STATUS, &status);
 		if (!(status & LP5523_LEDTEST_DONE))
 			usleep_range(3000, 6000);/* Was not ready. Wait. */
-		ret |= lp5523_read(chip->client, LP5523_REG_LED_TEST_ADC, &adc);
+		ret = lp5523_read(chip->client, LP5523_REG_LED_TEST_ADC, &adc);
+		if (ret)
+			goto fail;
 
 		if (adc >= vdd || adc < LP5523_ADC_SHORTCIRC_LIM)
 			pos += sprintf(buf + pos, "LED %d FAIL\n", i);
-- 
1.7.7.3


  parent reply	other threads:[~2012-01-30 22:05 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-01-30 22:00 [PATCH RESEND 00/16] some compiler warning fixes Danny Kukawka
2012-01-30 22:00 ` [PATCH 01/16] eicon: fix -Warray-bounds warning Danny Kukawka
2012-01-30 23:09   ` Ben Hutchings
2012-01-31 15:25     ` Karsten Keil
2012-01-31 17:04       ` Danny Kukawka
2012-02-01  9:04         ` David Laight
2012-02-01 12:52           ` Danny Kukawka
2012-02-02 18:25             ` Karsten Keil
2012-01-30 22:00 ` [PATCH v2 02/16] max2165: trival fix for some -Wuninitialized warning Danny Kukawka
2012-01-30 22:00 ` [PATCH v2 03/16] mmc: " Danny Kukawka
2012-01-30 22:00 ` [PATCH 05/16] cx18: fix handling of 'radio' module parameter Danny Kukawka
2012-01-31 13:45   ` Danny Kukawka
2012-01-31 14:59     ` Andy Walls
2012-02-01  2:29     ` Rusty Russell
2012-01-30 22:00 ` [PATCH 06/16] cpcihp: fix debug module parameter to be bool Danny Kukawka
2012-02-03  0:06   ` Scott Murray
2012-02-10 19:40   ` Jesse Barnes
2012-01-30 22:00 ` [PATCH v2 07/16] hdaps: trivial fix for -Wuninitialized Danny Kukawka
2012-01-30 22:00 ` [PATCH 09/16] [RFC] aic94xx: " Danny Kukawka
2012-01-30 22:00 ` [PATCH 10/16] ixj: fix Wsequence-point compiler warnings Danny Kukawka
2012-01-30 22:00 ` [PATCH 11/16] ath5k: make ath5k_modparam_no_hw_rfkill_switch real Danny Kukawka
2012-01-30 22:11   ` Jiri Slaby
2012-01-30 23:09     ` Danny Kukawka
2012-01-30 22:00 ` [PATCH 12/16] kobil_sct: fix debug module parameter to be bool Danny Kukawka
2012-01-30 23:13   ` Danny Kukawka
2012-01-30 22:00 ` [PATCH 13/16] riva/fbdev: fix several -Wuninitialized Danny Kukawka
2012-02-13 21:26   ` Florian Tobias Schandinat
2012-01-30 22:00 ` [PATCH 14/16] hamradio: fix incompatible pointer in module parameter Danny Kukawka
2012-02-01 19:40   ` David Miller
2012-01-30 22:00 ` [PATCH v2 15/16] leds-lp5521: fix compiler warning Danny Kukawka
2012-01-30 22:00 ` Danny Kukawka [this message]
     [not found] ` <1327960820-11867-9-git-send-email-danny.kukawka@bisect.de>
2012-01-31 13:45   ` [PATCH v2 08/16] ivtv-driver: fix handling of 'radio' module parameter Danny Kukawka
2012-01-31 15:00     ` Andy Walls

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1327960820-11867-17-git-send-email-danny.kukawka@bisect.de \
    --to=danny.kukawka@bisect.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=rpurdie@rpsys.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).