aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@linuxtv.org>2011-12-15 08:16:09 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-12-30 12:57:29 -0500
commit26110dac8b3b30a99555d85fc1308a21fba5b746 (patch)
tree5b2225de2991ccc7b4a182bcfa342616638b8413
parent7e7b8287af32400daea1e231057b4b75934af347 (diff)
[media] lgdt330x: fix behavior of read errors in lgdt330x_read_ucblocks
initialize *ucblocks to zero & fix the following build warning: lgdt330x.c: In function "lgdt330x_read_ucblocks": lgdt330x.c:288:6: warning: variable "err" set but not used [-Wunused-but-set-variable] Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/dvb/frontends/lgdt330x.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/media/dvb/frontends/lgdt330x.c b/drivers/media/dvb/frontends/lgdt330x.c
index 43971e63baa7..d45827158a24 100644
--- a/drivers/media/dvb/frontends/lgdt330x.c
+++ b/drivers/media/dvb/frontends/lgdt330x.c
@@ -288,6 +288,8 @@ static int lgdt330x_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
288 int err; 288 int err;
289 u8 buf[2]; 289 u8 buf[2];
290 290
291 *ucblocks = 0;
292
291 switch (state->config->demod_chip) { 293 switch (state->config->demod_chip) {
292 case LGDT3302: 294 case LGDT3302:
293 err = i2c_read_demod_bytes(state, LGDT3302_PACKET_ERR_COUNTER1, 295 err = i2c_read_demod_bytes(state, LGDT3302_PACKET_ERR_COUNTER1,
@@ -302,6 +304,8 @@ static int lgdt330x_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
302 "Only LGDT3302 and LGDT3303 are supported chips.\n"); 304 "Only LGDT3302 and LGDT3303 are supported chips.\n");
303 err = -ENODEV; 305 err = -ENODEV;
304 } 306 }
307 if (err < 0)
308 return err;
305 309
306 *ucblocks = (buf[0] << 8) | buf[1]; 310 *ucblocks = (buf[0] << 8) | buf[1];
307 return 0; 311 return 0;