Commit 5f70f8f0 authored by Dave Stevenson's avatar Dave Stevenson Committed by Zheng Zengkai
Browse files

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

stable inclusion
from stable-v5.10.113
commit 231381f5211620cec836b921f1c7a2cf702b3e8a
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I5ISAH

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=231381f5211620cec836b921f1c7a2cf702b3e8a



--------------------------------

[ Upstream commit f92055ae ]

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


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
Acked-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
parent 47edbfbf

drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c

+1 −1
Original line number Diff line number Diff line
@@ -229,7 +229,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)