Commit f92055ae authored by Dave Stevenson's avatar Dave Stevenson Committed by Maxime Ripard

drm/panel/raspberrypi-touchscreen: Avoid NULL deref if not initialised

If a call to rpi_touchscreen_i2c_write from rpi_touchscreen_probe
fails before mipi_dsi_device_register_full is called, then
in trying to log the error message if uses ts->dsi->dev when
it is still NULL.

Use ts->i2c->dev instead, which is initialised earlier in probe.

Fixes: 2f733d61 ("drm/panel: Add support for the Raspberry Pi 7" Touchscreen.")
Signed-off-by: default avatarDave Stevenson <dave.stevenson@raspberrypi.com>
Signed-off-by: default avatarStefan Wahren <stefan.wahren@i2se.com>
Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20220415162513.42190-2-stefan.wahren@i2se.com
parent f8e6b7ba
...@@ -229,7 +229,7 @@ static void rpi_touchscreen_i2c_write(struct rpi_touchscreen *ts, ...@@ -229,7 +229,7 @@ static void rpi_touchscreen_i2c_write(struct rpi_touchscreen *ts,
ret = i2c_smbus_write_byte_data(ts->i2c, reg, val); ret = i2c_smbus_write_byte_data(ts->i2c, reg, val);
if (ret) if (ret)
dev_err(&ts->dsi->dev, "I2C write failed: %d\n", ret); dev_err(&ts->i2c->dev, "I2C write failed: %d\n", ret);
} }
static int rpi_touchscreen_write(struct rpi_touchscreen *ts, u16 reg, u32 val) static int rpi_touchscreen_write(struct rpi_touchscreen *ts, u16 reg, u32 val)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment