diff options
author | qctecmdr <qctecmdr@localhost> | 2019-12-17 21:08:36 -0800 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-12-17 21:08:35 -0800 |
commit | 63dd11f367df3023b098267b171eabbb4b1f6d17 (patch) | |
tree | b70f1f7f0d9379fc318bb1323d9d977c3539cd7b | |
parent | c4235f7fc14f349dde452ecb795523d083eb6bf6 (diff) | |
parent | a27ec19db539b5bfcbbec59a799390f340917514 (diff) | |
download | display-drivers-63dd11f367df3023b098267b171eabbb4b1f6d17.tar.gz |
Merge "disp: msm: add check for memory allocation"
-rw-r--r-- | msm/dp/dp_display.c | 3 | ||||
-rw-r--r-- | msm/msm_notifier.c | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/msm/dp/dp_display.c b/msm/dp/dp_display.c index 177d8fac..b6ce893e 100644 --- a/msm/dp/dp_display.c +++ b/msm/dp/dp_display.c @@ -1241,8 +1241,9 @@ static int dp_display_usbpd_disconnect_cb(struct device *dev) if (!dp->debug->sim_mode && !dp->parser->no_aux_switch && !dp->parser->gpio_aux_switch) dp->aux->aux_switch(dp->aux, false, ORIENTATION_NONE); -end: + SDE_EVT32_EXTERNAL(SDE_EVTLOG_FUNC_EXIT, dp->state); +end: return rc; } diff --git a/msm/msm_notifier.c b/msm/msm_notifier.c index de08f38f..5f9c2fd3 100644 --- a/msm/msm_notifier.c +++ b/msm/msm_notifier.c @@ -129,6 +129,9 @@ static int msm_notifier_probe(struct platform_device *pdev) active_displays = devm_kzalloc(&pdev->dev, sizeof(*active_displays), GFP_KERNEL); + if (!active_displays) + return -ENOMEM; + INIT_LIST_HEAD(&active_displays->list); /* Set default max fps to 0 */ |