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 45a06e4..da201b8 100644 (file)
--- a/drivers/input/touchscreen/ads7846.c
+++ b/drivers/input/touchscreen/ads7846.c
@@ -425,7 +425,7 @@ static int ads7845_read12_ser(struct device *dev, unsigned command)
 name ## _show(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
        struct ads7846 *ts = dev_get_drvdata(dev); \
-       ssize_t v = ads7846_read12_ser(dev, \
+       ssize_t v = ads7846_read12_ser(&ts->spi->dev, \
                        READ_12BIT_SER(var)); \
        if (v < 0) \
                return v; \
@@ -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;
                }