Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ebc90be6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drm-tda998x-fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm 

Pull TDA998x i2c driver fixes from Russell King:
 "This fixes the double-checksumming of the AVI infoframe which was
  resulting in the checksum always being zero.  It went unnoticed as
  none of my HDMI devices had a problem with this"

[ Pulling directly from rmk since Dave Airlie is on vacation  - Linus ]

* 'drm-tda998x-fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
  drm/i2c: tda998x: fix bad checksum of the HDMI AVI infoframe
parents 4469942b 4a6ca1a2

drivers/gpu/drm/i2c/tda998x_drv.c

+2 −2
Original line number Diff line number Diff line
@@ -606,8 +606,6 @@ static void 
tda998x_write_if(struct tda998x_priv *priv, uint8_t bit, uint16_t addr,

		 uint8_t *buf, size_t size)

{

	buf[PB(0)] = tda998x_cksum(buf, size);



	reg_clear(priv, REG_DIP_IF_FLAGS, bit);

	reg_write_range(priv, addr, buf, size);

	reg_set(priv, REG_DIP_IF_FLAGS, bit);
@@ -627,6 +625,8 @@ tda998x_write_aif(struct tda998x_priv *priv, struct tda998x_encoder_params *p) 
	buf[PB(4)] = p->audio_frame[4];

	buf[PB(5)] = p->audio_frame[5] & 0xf8; /* DM_INH + LSV */



	buf[PB(0)] = tda998x_cksum(buf, sizeof(buf));



	tda998x_write_if(priv, DIP_IF_FLAGS_IF4, REG_IF4_HB0, buf,

			 sizeof(buf));

}