mirror of
https://github.com/Ysurac/openmptcprouter.git
synced 2025-03-09 15:40:20 +00:00
32 lines
1,022 B
Diff
32 lines
1,022 B
Diff
From 7791d2b93c6d19d04db1a1c16fdb7949b562d005 Mon Sep 17 00:00:00 2001
|
|
From: Eric Anholt <eric@anholt.net>
|
|
Date: Wed, 12 Apr 2017 17:52:56 -0700
|
|
Subject: [PATCH 137/277] panel-raspberrypi-touchscreen: Fix NULL deref if
|
|
probe order goes wrong.
|
|
|
|
If the i2c driver hadn't pobed before the panel driver probes, then
|
|
the client would be NULL but we were looking for an ERR_PTR in the
|
|
error case.
|
|
|
|
Signed-off-by: Eric Anholt <eric@anholt.net>
|
|
---
|
|
drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c | 3 +++
|
|
1 file changed, 3 insertions(+)
|
|
|
|
diff --git a/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c b/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c
|
|
index 1a536fe4d040..5d6bfd81b07a 100644
|
|
--- a/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c
|
|
+++ b/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c
|
|
@@ -399,6 +399,9 @@ static struct i2c_client *rpi_touchscreen_get_i2c(struct device *dev,
|
|
|
|
of_node_put(node);
|
|
|
|
+ if (!client)
|
|
+ return ERR_PTR(-EPROBE_DEFER);
|
|
+
|
|
return client;
|
|
}
|
|
|
|
--
|
|
2.16.1
|
|
|