Re: DVB: af9015 defunct [was: mmotm 2010-10-20-15-01 uploaded]

[Mauro Carvalho Chehab]

Em 27-10-2010 14:36, Jiri Slaby escreveu:

>> It will properly log the size of the message the driver tried to use, and will
>> reduce the max number of bytes per I2C transfer to 8.
> 
> Yes, this one works. And to be sure that 16 doesn't work I unplugged and
> replugged the device (I didn't last time). And boom, it works too. So
> .small_i2c = TDA18271_16_BYTE_CHUNK_INIT fixes the issue as well.

Ok, I'm adding the enclosing patch to the tree, adding a proper description
about the regression. 

I'll be adding it to the tree.

Thanks!
Mauro

---

commit 7655e594945289b418af39f6669fea4666a7b520
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Wed Oct 27 14:55:34 2010 -0200

    [media] af9015: Fix max I2C message size when used with tda18271
    
    Changeset 1724c8fa7eb33d68898e060a08a8e6a88348b62f added an option to change
    the maximum I2C size to 8 bytes. However, it forgot to replace the previous
    usage at af9015 to use the newly defined macro value
    (TDA18271_16_BYTE_CHUNK_INIT).
    
    A latter changeset (e350d44fed8eb86a7192a579e3687fcd76a4645b) extended the
    possible values for .small_i2c field and, instead of using a random sequence
    of numbers, it used a number that makes more sense (e. g. the actual limit,
    in terms of bytes).
    
    However, as af9015 were using .small_i2c = 1, this become undefined, and the
    restriction of a max size of 16 was gone.
    
    While here, fix the reported msg size at tda18271-common.c.
    
    Reported-by: Jiri Slaby <jirislaby@xxxxxxxxx>
    Tested-by: Jiri Slaby <jirislaby@xxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

diff --git a/drivers/media/common/tuners/tda18271-common.c b/drivers/media/common/tuners/tda18271-common.c
index 195b30e..5466d47 100644
--- a/drivers/media/common/tuners/tda18271-common.c
+++ b/drivers/media/common/tuners/tda18271-common.c
@@ -237,7 +237,7 @@ int tda18271_write_regs(struct dvb_frontend *fe, int idx, int len)
 
 	if (ret != 1)
 		tda_err("ERROR: idx = 0x%x, len = %d, "
-			"i2c_transfer returned: %d\n", idx, len, ret);
+			"i2c_transfer returned: %d\n", idx, max, ret);
 
 	return (ret == 1 ? 0 : ret);
 }
diff --git a/drivers/media/dvb/dvb-usb/af9015.c b/drivers/media/dvb/dvb-usb/af9015.c
index 3ef19a8..31c0a0e 100644
--- a/drivers/media/dvb/dvb-usb/af9015.c
+++ b/drivers/media/dvb/dvb-usb/af9015.c
@@ -1131,7 +1131,7 @@ static struct qt1010_config af9015_qt1010_config = {
 
 static struct tda18271_config af9015_tda18271_config = {
 	.gate = TDA18271_GATE_DIGITAL,
-	.small_i2c = 1,
+	.small_i2c = TDA18271_16_BYTE_CHUNK_INIT,
 };
 
 static struct mxl5005s_config af9015_mxl5003_config = {


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/