mirror of
https://github.com/Ysurac/openmptcprouter.git
synced 2025-02-15 04:42:02 +00:00
35 lines
1.3 KiB
Diff
35 lines
1.3 KiB
Diff
|
From 0a40d31a627e592b76086e85b13906819cd24221 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
||
|
|
Date: Fri, 3 Sep 2021 17:47:37 +0100
|
||
|
|
Subject: [PATCH 508/634] 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.
|
||
|
|
|
||
|
|
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
||
|
|
---
|
||
|
|
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 07013bfddf42..f361cedac6ea 100644
|
||
|
|
--- a/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c
|
||
|
|
+++ b/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c
|
||
|
|
@@ -257,7 +257,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.33.1
|
||
|
|
|