Merge branch 'drm-tda9950-fixes' of git://git.armlinux.org.uk/~rmk/linux-arm into...

two tda9950 fixes.

Signed-off-by: Dave Airlie <[email protected]>
From: Russell King <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]

diff --combined drivers/gpu/drm/i2c/tda9950.c
index 5d2f0d548469e1dd4808d8be5dfe8be62edfef0b,ccd355d0c123064dd5a34e8b002d738faeec4b93..250b5e02a314a493fd0c41477237bf44f7208225
--- 1/drivers/gpu/drm/i2c/tda9950.c
--- 2/drivers/gpu/drm/i2c/tda9950.c
+++ b/drivers/gpu/drm/i2c/tda9950.c
@@@ -76,12 -76,9 +76,12 @@@ struct tda9950_priv 
  static int tda9950_write_range(struct i2c_client *client, u8 addr, u8 *p, int cnt)
  {
        struct i2c_msg msg;
 -      u8 buf[cnt + 1];
 +      u8 buf[CEC_MAX_MSG_SIZE + 3];
        int ret;
  
 +      if (WARN_ON(cnt > sizeof(buf) - 1))
 +              return -EINVAL;
 +
        buf[0] = addr;
        memcpy(buf + 1, p, cnt);
  
@@@ -191,7 -188,8 +191,8 @@@ static irqreturn_t tda9950_irq(int irq
                        break;
                }
                /* TDA9950 executes all retries for us */
-               tx_status |= CEC_TX_STATUS_MAX_RETRIES;
+               if (tx_status != CEC_TX_STATUS_OK)
+                       tx_status |= CEC_TX_STATUS_MAX_RETRIES;
                cec_transmit_done(priv->adap, tx_status, arb_lost_cnt,
                                  nack_cnt, 0, err_cnt);
                break;
@@@ -310,7 -308,7 +311,7 @@@ static void tda9950_release(struct tda9
        /* Wait up to .5s for it to signal non-busy */
        do {
                csr = tda9950_read(client, REG_CSR);
-               if (!(csr & CSR_BUSY) || --timeout)
+               if (!(csr & CSR_BUSY) || !--timeout)
                        break;
                msleep(10);
        } while (1);