| From ab2e8a9ba42e8f24c9f4cfd2b9e2549c7826e881 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 15 Apr 2022 18:25:12 +0200 |
| Subject: drm/panel/raspberrypi-touchscreen: Avoid NULL deref if not |
| initialised |
| |
| From: Dave Stevenson <dave.stevenson@raspberrypi.com> |
| |
| [ Upstream commit f92055ae0acb035891e988ce345d6b81a0316423 ] |
| |
| 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: 2f733d6194bd ("drm/panel: Add support for the Raspberry Pi 7" Touchscreen.") |
| Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> |
| Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com> |
| Signed-off-by: Maxime Ripard <maxime@cerno.tech> |
| Link: https://patchwork.freedesktop.org/patch/msgid/20220415162513.42190-2-stefan.wahren@i2se.com |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c b/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c |
| index bdb4d59c8127..6906f522521d 100644 |
| --- a/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c |
| +++ b/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c |
| @@ -232,7 +232,7 @@ static void rpi_touchscreen_i2c_write(struct rpi_touchscreen *ts, |
| |
| ret = i2c_smbus_write_byte_data(ts->i2c, reg, val); |
| 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) |
| -- |
| 2.35.1 |
| |
