From fab031fed7f2db4453f322e8278d40df130e3dc9 Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Thu, 15 Dec 2011 10:16:09 -0300 Subject: [PATCH] --- yaml --- r: 285424 b: refs/heads/master c: 26110dac8b3b30a99555d85fc1308a21fba5b746 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/frontends/lgdt330x.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 851eab0cdbb0..d14b8c2e6b6e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7e7b8287af32400daea1e231057b4b75934af347 +refs/heads/master: 26110dac8b3b30a99555d85fc1308a21fba5b746 diff --git a/trunk/drivers/media/dvb/frontends/lgdt330x.c b/trunk/drivers/media/dvb/frontends/lgdt330x.c index 43971e63baa7..d45827158a24 100644 --- a/trunk/drivers/media/dvb/frontends/lgdt330x.c +++ b/trunk/drivers/media/dvb/frontends/lgdt330x.c @@ -288,6 +288,8 @@ static int lgdt330x_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks) int err; u8 buf[2]; + *ucblocks = 0; + switch (state->config->demod_chip) { case LGDT3302: 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) "Only LGDT3302 and LGDT3303 are supported chips.\n"); err = -ENODEV; } + if (err < 0) + return err; *ucblocks = (buf[0] << 8) | buf[1]; return 0;