summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2013-09-11 22:09:02 +0800
committerRob Clark <robdclark@gmail.com>2013-09-12 10:32:12 -0400
commitaea6a64c38725b6fb30738a31695ef81af3079c3 (patch)
tree47fe844d0c7b0d649f25fbfbb6f69d4e2bd15f43
parent6b8819c811c2a80a7e5896b4d1e2580be825d590 (diff)
downloadop-kernel-dev-aea6a64c38725b6fb30738a31695ef81af3079c3.zip
op-kernel-dev-aea6a64c38725b6fb30738a31695ef81af3079c3.tar.gz
drm/msm: fix potential NULL pointer dereference
The dereference to 'pdata' should be moved below the NULL test. Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
-rw-r--r--drivers/gpu/drm/msm/msm_gpu.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c
index 7ddcfbe..3bab937 100644
--- a/drivers/gpu/drm/msm/msm_gpu.c
+++ b/drivers/gpu/drm/msm/msm_gpu.c
@@ -29,13 +29,14 @@
static void bs_init(struct msm_gpu *gpu, struct platform_device *pdev)
{
struct drm_device *dev = gpu->dev;
- struct kgsl_device_platform_data *pdata = pdev->dev.platform_data;
+ struct kgsl_device_platform_data *pdata;
if (!pdev) {
dev_err(dev->dev, "could not find dtv pdata\n");
return;
}
+ pdata = pdev->dev.platform_data;
if (pdata->bus_scale_table) {
gpu->bsc = msm_bus_scale_register_client(pdata->bus_scale_table);
DBG("bus scale client: %08x", gpu->bsc);
OpenPOWER on IntegriCloud