Merge tag 'v5.1-rc1' into spi-5.2

[sfrench/cifs-2.6.git] / drivers / input / touchscreen / pixcir_i2c_ts.c

diff --git a/drivers/input/touchscreen/pixcir_i2c_ts.c b/drivers/input/touchscreen/pixcir_i2c_ts.c
index 3bb0637d832e412944d9f6511c99e32705785702..37ff672c780233a4f1423564288c104a6f32e5e0 100644 (file)
--- a/drivers/input/touchscreen/pixcir_i2c_ts.c
+++ b/drivers/input/touchscreen/pixcir_i2c_ts.c
@@ -461,7 +461,7 @@ static int pixcir_i2c_ts_probe(struct i2c_client *client,
                if (error)
                        return error;
        } else {
-               dev_err(&client->dev, "platform data not defined\n");
+               dev_err(dev, "platform data not defined\n");
                return -EINVAL;
        }
 
@@ -483,7 +483,7 @@ static int pixcir_i2c_ts_probe(struct i2c_client *client,
        input->id.bustype = BUS_I2C;
        input->open = pixcir_input_open;
        input->close = pixcir_input_close;
-       input->dev.parent = &client->dev;
+       input->dev.parent = dev;
 
        if (pdata) {
                input_set_abs_params(input, ABS_MT_POSITION_X, 0, pdata->x_max, 0, 0);