lkml.org 
[lkml]   [2019]   [Oct]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 108/185] media: saa7134: fix terminology around saa7134_i2c_eeprom_md7134_gate()
    Date
    From: Maciej S. Szmigiero <mail@maciej.szmigiero.name>

    [ Upstream commit 9d802222a3405599d6e1984d9324cddf592ea1f4 ]

    saa7134_i2c_eeprom_md7134_gate() function and the associated comment uses
    an inverted i2c gate open / closed terminology.
    Let's fix this.

    Signed-off-by: Maciej S. Szmigiero <mail@maciej.szmigiero.name>
    Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
    [hverkuil-cisco@xs4all.nl: fix alignment checkpatch warning]
    Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/media/pci/saa7134/saa7134-i2c.c | 12 ++++++++----
    1 file changed, 8 insertions(+), 4 deletions(-)

    diff --git a/drivers/media/pci/saa7134/saa7134-i2c.c b/drivers/media/pci/saa7134/saa7134-i2c.c
    index 8f2ed632840f7..f70a799836840 100644
    --- a/drivers/media/pci/saa7134/saa7134-i2c.c
    +++ b/drivers/media/pci/saa7134/saa7134-i2c.c
    @@ -351,7 +351,11 @@ static struct i2c_client saa7134_client_template = {

    /* ----------------------------------------------------------- */

    -/* On Medion 7134 reading EEPROM needs DVB-T demod i2c gate open */
    +/*
    + * On Medion 7134 reading the SAA7134 chip config EEPROM needs DVB-T
    + * demod i2c gate closed due to an address clash between this EEPROM
    + * and the demod one.
    + */
    static void saa7134_i2c_eeprom_md7134_gate(struct saa7134_dev *dev)
    {
    u8 subaddr = 0x7, dmdregval;
    @@ -368,14 +372,14 @@ static void saa7134_i2c_eeprom_md7134_gate(struct saa7134_dev *dev)

    ret = i2c_transfer(&dev->i2c_adap, i2cgatemsg_r, 2);
    if ((ret == 2) && (dmdregval & 0x2)) {
    - pr_debug("%s: DVB-T demod i2c gate was left closed\n",
    + pr_debug("%s: DVB-T demod i2c gate was left open\n",
    dev->name);

    data[0] = subaddr;
    data[1] = (dmdregval & ~0x2);
    if (i2c_transfer(&dev->i2c_adap, i2cgatemsg_w, 1) != 1)
    - pr_err("%s: EEPROM i2c gate open failure\n",
    - dev->name);
    + pr_err("%s: EEPROM i2c gate close failure\n",
    + dev->name);
    }
    }

    --
    2.20.1


    \
     
     \ /
      Last update: 2019-10-03 18:11    [W:4.342 / U:0.088 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site