OSDN Git Service

media: adv7511: fix incorrect clear of CEC receive interrupt
authorHans Verkuil <hans.verkuil@cisco.com>
Tue, 22 May 2018 11:33:14 +0000 (07:33 -0400)
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Mon, 28 May 2018 20:25:45 +0000 (16:25 -0400)
If a CEC message was received and the RX interrupt was set, but
not yet processed, and a new transmit was issues, then the
transmit code would inadvertently clear the RX interrupt and
after that no new messages would ever be received.

Instead it should only clear TX interrupts since register 0x97
is a clear-on-write register.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
drivers/media/i2c/adv7511.c

index d4b191c..5731751 100644 (file)
@@ -831,8 +831,8 @@ static int adv7511_cec_adap_transmit(struct cec_adapter *adap, u8 attempts,
         */
        adv7511_cec_write_and_or(sd, 0x12, ~0x70, max(1, attempts - 1) << 4);
 
-       /* blocking, clear cec tx irq status */
-       adv7511_wr_and_or(sd, 0x97, 0xc7, 0x38);
+       /* clear cec tx irq status */
+       adv7511_wr(sd, 0x97, 0x38);
 
        /* write data */
        for (i = 0; i < len; i++)