diff --git a/services/surfaceflinger/DisplayHardware/HWComposer.cpp b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
index 2e4384e..1b55792 100644
--- a/services/surfaceflinger/DisplayHardware/HWComposer.cpp
+++ b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
@@ -188,7 +188,7 @@
 
 HWComposer::~HWComposer() {
     if (mHwc) {
-        mHwc->eventControl(mHwc, 0, EVENT_VSYNC, 0);
+        mHwc->eventControl(mHwc, HWC_DISPLAY_PRIMARY, HWC_EVENT_VSYNC, 0);
     }
     if (mVSyncThread != NULL) {
         mVSyncThread->requestExitAndWait();
@@ -540,7 +540,7 @@
 
 status_t HWComposer::release() const {
     if (mHwc) {
-        mHwc->eventControl(mHwc, 0, HWC_EVENT_VSYNC, 0);
+        mHwc->eventControl(mHwc, HWC_DISPLAY_PRIMARY, HWC_EVENT_VSYNC, 0);
         return (status_t)mHwc->blank(mHwc, 0, 1);
     }
     return NO_ERROR;
diff --git a/services/surfaceflinger/EventThread.cpp b/services/surfaceflinger/EventThread.cpp
index ade9f75..19e711e 100644
--- a/services/surfaceflinger/EventThread.cpp
+++ b/services/surfaceflinger/EventThread.cpp
@@ -265,11 +265,6 @@
     mDebugVsyncEnabled = false;
 }
 
-status_t EventThread::readyToRun() {
-    ALOGI("EventThread ready to run.");
-    return NO_ERROR;
-}
-
 void EventThread::dump(String8& result, char* buffer, size_t SIZE) const {
     Mutex::Autolock _l(mLock);
     result.appendFormat("VSYNC state: %s\n",
diff --git a/services/surfaceflinger/EventThread.h b/services/surfaceflinger/EventThread.h
index c8bb312..a92ba5c 100644
--- a/services/surfaceflinger/EventThread.h
+++ b/services/surfaceflinger/EventThread.h
@@ -85,7 +85,6 @@
 
 private:
     virtual bool        threadLoop();
-    virtual status_t    readyToRun();
     virtual void        onFirstRef();
 
     void removeDisplayEventConnection(const wp<Connection>& connection);