1 files changed, 14 insertions, 13 deletions

diff --git a/drivers/i2c/busses/i2c-axxia.c b/drivers/i2c/busses/i2c-axxia.c
index 768a598d8d03..32d883490863 100644
--- a/drivers/i2c/busses/i2c-axxia.c
+++ b/drivers/i2c/busses/i2c-axxia.c
@@ -334,12 +334,7 @@ static int axxia_i2c_xfer_msg(struct axxia_i2c_dev *idev, struct i2c_msg *msg)
         u32 int_mask = MST_STATUS_ERR | MST_STATUS_SNS;
         u32 rx_xfer, tx_xfer;
         u32 addr_1, addr_2;
-        int ret;
-
-        if (msg->len > 255) {
-                dev_warn(idev->dev, "unsupported length %u\n", msg->len);
-                return -EINVAL;
-        }
+        unsigned long time_left;
 
         idev->msg = msg;
         idev->msg_xfrd = 0;
@@ -388,15 +383,15 @@ static int axxia_i2c_xfer_msg(struct axxia_i2c_dev *idev, struct i2c_msg *msg)
 
         i2c_int_enable(idev, int_mask);
 
-        ret = wait_for_completion_timeout(&idev->msg_complete,
-                                          I2C_XFER_TIMEOUT);
+        time_left = wait_for_completion_timeout(&idev->msg_complete,
+                                              I2C_XFER_TIMEOUT);
 
         i2c_int_disable(idev, int_mask);
 
         if (readl(idev->base + MST_COMMAND) & CMD_BUSY)
                 dev_warn(idev->dev, "busy after xfer\n");
 
-        if (ret == 0)
+        if (time_left == 0)
                 idev->msg_err = -ETIMEDOUT;
 
         if (unlikely(idev->msg_err) && idev->msg_err != -ENXIO)
@@ -408,17 +403,17 @@ static int axxia_i2c_xfer_msg(struct axxia_i2c_dev *idev, struct i2c_msg *msg)
 static int axxia_i2c_stop(struct axxia_i2c_dev *idev)
 {
         u32 int_mask = MST_STATUS_ERR | MST_STATUS_SCC;
-        int ret;
+        unsigned long time_left;
 
         reinit_completion(&idev->msg_complete);
 
         /* Issue stop */
         writel(0xb, idev->base + MST_COMMAND);
         i2c_int_enable(idev, int_mask);
-        ret = wait_for_completion_timeout(&idev->msg_complete,
-                                          I2C_STOP_TIMEOUT);
+        time_left = wait_for_completion_timeout(&idev->msg_complete,
+                                              I2C_STOP_TIMEOUT);
         i2c_int_disable(idev, int_mask);
-        if (ret == 0)
+        if (time_left == 0)
                 return -ETIMEDOUT;
 
         if (readl(idev->base + MST_COMMAND) & CMD_BUSY)
@@ -454,6 +449,11 @@ static const struct i2c_algorithm axxia_i2c_algo = {
         .functionality = axxia_i2c_func,
 };
 
+static struct i2c_adapter_quirks axxia_i2c_quirks = {
+        .max_read_len = 255,
+        .max_write_len = 255,
+};
+
 static int axxia_i2c_probe(struct platform_device *pdev)
 {
         struct device_node *np = pdev->dev.of_node;
@@ -511,6 +511,7 @@ static int axxia_i2c_probe(struct platform_device *pdev)
         strlcpy(idev->adapter.name, pdev->name, sizeof(idev->adapter.name));
         idev->adapter.owner = THIS_MODULE;
         idev->adapter.algo = &axxia_i2c_algo;
+        idev->adapter.quirks = &axxia_i2c_quirks;
         idev->adapter.dev.parent = &pdev->dev;
         idev->adapter.dev.of_node = pdev->dev.of_node;