Merge branch 'next' into for-linus

[~andy/linux] / drivers / input / touchscreen / cyttsp_core.c

diff --git a/drivers/input/touchscreen/cyttsp_core.c b/drivers/input/touchscreen/cyttsp_core.c
index ae89d2609ab0bd1a7e943cef3550ac0b992e18df..d53e0b72a4078aadcb05ab43c319fce8b786da76 100644 (file)
--- a/drivers/input/touchscreen/cyttsp_core.c
+++ b/drivers/input/touchscreen/cyttsp_core.c
@@ -84,7 +84,8 @@ static int ttsp_read_block_data(struct cyttsp *ts, u8 command,
        int tries;
 
        for (tries = 0; tries < CY_NUM_RETRY; tries++) {
-               error = ts->bus_ops->read(ts, command, length, buf);
+               error = ts->bus_ops->read(ts->dev, ts->xfer_buf, command,
+                               length, buf);
                if (!error)
                        return 0;
 
@@ -101,7 +102,8 @@ static int ttsp_write_block_data(struct cyttsp *ts, u8 command,
        int tries;
 
        for (tries = 0; tries < CY_NUM_RETRY; tries++) {
-               error = ts->bus_ops->write(ts, command, length, buf);
+               error = ts->bus_ops->write(ts->dev, ts->xfer_buf, command,
+                               length, buf);
                if (!error)
                        return 0;