libhwc2.1: Clean up ExynosDeviceDrmInterface code

Change-Id: I6784dcc3d78d144bcb845d658fab7d9bd482db02
Signed-off-by: HyunKyung Kim <hk310.kim@samsung.com>

1 files changed, 4 insertions, 3 deletions

diff --git a/libhwc2.1/libdisplayinterface/ExynosDeviceDrmInterface.cpp b/libhwc2.1/libdisplayinterface/ExynosDeviceDrmInterface.cpp
index cbb5358..486496f 100644
--- a/libhwc2.1/libdisplayinterface/ExynosDeviceDrmInterface.cpp
+++ b/libhwc2.1/libdisplayinterface/ExynosDeviceDrmInterface.cpp
@@ -41,7 +41,7 @@ void ExynosDeviceDrmInterface::init(ExynosDevice *exynosDevice)
     updateRestrictions();
 
     mExynosDrmEventHandler.init(mExynosDevice);
-    mDrmDevice->event_listener()->RegisterHotplugHandler((DrmEventHandler *)&mExynosDrmEventHandler);
+    mDrmDevice->event_listener()->RegisterHotplugHandler(static_cast<DrmEventHandler *>(&mExynosDrmEventHandler));
 
     ExynosDisplay *primaryDisplay = mExynosDevice->getDisplay(HWC_DISPLAY_PRIMARY);
     if (primaryDisplay != NULL) {
@@ -69,6 +69,7 @@ void ExynosDeviceDrmInterface::ExynosDrmEventHandler::init(ExynosDevice *exynosD
 void ExynosDeviceDrmInterface::ExynosDrmEventHandler::HandleEvent(uint64_t timestamp_us)
 {
     /* TODO: Check plug status hear or ExynosExternalDisplay::handleHotplugEvent() */
-    ExynosExternalDisplayModule *display = (ExynosExternalDisplayModule*)mExynosDevice->getDisplay(HWC_DISPLAY_EXTERNAL);
-    display->handleHotplugEvent();
+    ExynosExternalDisplayModule *display = static_cast<ExynosExternalDisplayModule*>(mExynosDevice->getDisplay(HWC_DISPLAY_EXTERNAL));
+    if (display != NULL)
+        display->handleHotplugEvent();
 }