Merge tag 'v3.15-rc5' into next

[pandora-kernel.git] / drivers / input / touchscreen / ads7846.c

diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c
index 7f8aa98..da201b8 100644 (file)
--- a/drivers/input/touchscreen/ads7846.c
+++ b/drivers/input/touchscreen/ads7846.c
@@ -706,7 +706,7 @@ static void ads7846_read_state(struct ads7846 *ts)
                m = &ts->msg[msg_idx];
                error = spi_sync(ts->spi, m);
                if (error) {
-                       dev_err(&ts->spi->dev, "spi_async --> %d\n", error);
+                       dev_err(&ts->spi->dev, "spi_sync --> %d\n", error);
                        packet->tc.ignore = true;
                        return;
                }