diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-05-24 19:30:15 +0300 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-05-24 19:30:15 +0300 |
| commit | 754451342fc5954061ede74b0a8485ec4a4c6eaa (patch) | |
| tree | 82daccba5779de492631c42e47a614bd9d4cddd2 /drivers/input/rmi4/rmi_spi.c | |
| parent | bf232e460a3530adf17da7d7f1332347b73a3d08 (diff) | |
| parent | 771c577c23bac90597c685971d7297ea00f99d11 (diff) | |
| download | linux-754451342fc5954061ede74b0a8485ec4a4c6eaa.tar.xz | |
Merge tag 'v4.17-rc6' into next
Sync up with mainline to bring in Atmel controller changes for Caroline.
Diffstat (limited to 'drivers/input/rmi4/rmi_spi.c')
| -rw-r--r-- | drivers/input/rmi4/rmi_spi.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/input/rmi4/rmi_spi.c b/drivers/input/rmi4/rmi_spi.c index 76edbf2c1bce..082defc329a8 100644 --- a/drivers/input/rmi4/rmi_spi.c +++ b/drivers/input/rmi4/rmi_spi.c @@ -147,8 +147,11 @@ static int rmi_spi_xfer(struct rmi_spi_xport *rmi_spi, if (len > RMI_SPI_XFER_SIZE_LIMIT) return -EINVAL; - if (rmi_spi->xfer_buf_size < len) - rmi_spi_manage_pools(rmi_spi, len); + if (rmi_spi->xfer_buf_size < len) { + ret = rmi_spi_manage_pools(rmi_spi, len); + if (ret < 0) + return ret; + } if (addr == 0) /* |